From 5fd3c3a36f06e01cbc781abef153992879377306 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期六, 07 五月 2022 15:04:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/App_Data/MssqlReportData.cs                              |    4 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ICMOBillList.aspx            |   12 
 WebTM/views/user/login.html                                    |    6 
 WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html           |  432 ++
 WebTM/views/验收入库/委外出库/Kf_EntrustOutBill_FastList.html          |  387 ++
 WebTM/views/模治具管理/模治具管理/BatchGen_MouldFile.html                |   10 
 WebTM/views/PublicPage/PartInformation.html                    |    2 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user              |  115 
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html           | 1019 ++++++
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html    |  490 ++
 WebTM/views/index_Mobile.html                                  |    4 
 WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html  |  490 ++
 WebTM/views/验收入库/委外出库/Kf_EntrustOutBill_Fast.html              | 1033 ++++++
 WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html         |  474 ++
 WebTM/views/生产管理/齐套分析/JIT_CompleteMaterialDetailList.html      |  361 ++
 WebTM/views/基础资料/公用基础资料/xmlLBM_MouldScrapOutStockBill.aspx     |   24 
 WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html |   12 
 WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html         |  171 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                      |    8 
 WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html  |  439 ++
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html    |  439 ++
 WebTM/views/index.html                                         |   36 
 WebTM/views/生产管理/即时库存/JIT_InventoryList.html                   |  231 +
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html                  |    1 
 WebTM/WebTM.csproj.user                                        |    2 
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html           |  432 ++
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html                  |   33 
 WebTM/views/验收入库/委外入库/Kf_EntrustInBill_FastList.html           |    3 
 WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html           |  969 +++++
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html              | 1397 ++++++++
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html              |  442 ++
 WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html              |  265 +
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                      |    3 
 WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html             |   56 
 WebTM/layuiadmin/Scripts/webConfig.js                          |    4 
 WebTM/views/基础资料/公用基础资料/Gy_Currency.html                       |   36 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                    |   40 
 WebTM/WebTM.csproj                                             |   16 
 38 files changed, 9,740 insertions(+), 158 deletions(-)

diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index cea7777..47fd479 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -20,8 +20,8 @@
     //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;";//涓镐簳
-    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
-    public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
+    public const string SqlConnStr = "Data Source=192.168.0.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 string sServer;
     //public string sDataBase;
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 0400e90..35ff0f9 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5,7 +5,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
-    <History>False|2022-04-12T07:13:02.1028573Z;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+    <History>True|2022-04-22T09:26:31.1780137Z;True|2022-04-19T16:20:09.8422169+08:00;False|2022-04-12T15:13:02.1028573+08:00;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="bin/layuiadmin/style/admin.css">
@@ -18,13 +18,13 @@
       <publishTime>01/28/2016 14:22:24</publishTime>
     </File>
     <File Include="bin/WebTM.dll">
-      <publishTime>04/13/2022 10:16:48</publishTime>
+      <publishTime>04/22/2022 17:25:49</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>04/13/2022 10:16:48</publishTime>
+      <publishTime>04/22/2022 17:25:49</publishTime>
     </File>
     <File Include="HtmlPage1.html">
-      <publishTime>03/14/2022 15:07:22</publishTime>
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="layuiadmin/config.js">
       <publishTime>08/16/2021 17:24:30</publishTime>
@@ -660,7 +660,7 @@
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig.js">
-      <publishTime>04/07/2022 15:12:37</publishTime>
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="layuiadmin/style/admin.css">
       <publishTime>10/11/2021 17:58:53</publishTime>
@@ -1194,7 +1194,7 @@
       <publishTime>01/19/2022 18:05:12</publishTime>
     </File>
     <File Include="views/home/console_Mobile.html">
-      <publishTime>02/10/2022 17:29:15</publishTime>
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="views/home/homepage1.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
@@ -1215,13 +1215,13 @@
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/index.html">
-      <publishTime>04/07/2022 09:24:22</publishTime>
+      <publishTime>04/22/2022 17:21:07</publishTime>
     </File>
     <File Include="views/indexMenu.html">
       <publishTime>02/25/2022 18:33:51</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
-      <publishTime>03/22/2022 15:55:35</publishTime>
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="views/IpadIndex.html">
       <publishTime>12/09/2021 17:34:28</publishTime>
@@ -1296,7 +1296,7 @@
       <publishTime>10/13/2021 17:34:32</publishTime>
     </File>
     <File Include="views/PublicPage/PartInformation.html">
-      <publishTime>12/14/2021 17:32:50</publishTime>
+      <publishTime>04/18/2022 14:25:58</publishTime>
     </File>
     <File Include="views/PublicPage/PeopleInformation.html">
       <publishTime>10/21/2021 19:15:54</publishTime>
@@ -1452,7 +1452,7 @@
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/login.html">
-      <publishTime>01/10/2022 21:12:01</publishTime>
+      <publishTime>04/22/2022 17:21:07</publishTime>
     </File>
     <File Include="views/user/reg.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
@@ -1509,7 +1509,7 @@
       <publishTime>02/16/2022 11:16:48</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
-      <publishTime>03/09/2022 17:31:37</publishTime>
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
       <publishTime>04/01/2022 15:23:32</publishTime>
@@ -1905,7 +1905,7 @@
       <publishTime>11/10/2021 10:49:48</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_MouldScrapOutStockBill.aspx">
-      <publishTime>11/10/2021 10:50:19</publishTime>
+      <publishTime>04/22/2022 17:21:07</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_MouldTypeBill.aspx">
       <publishTime>04/02/2022 14:20:20</publishTime>
@@ -1914,7 +1914,7 @@
       <publishTime>04/11/2022 16:55:14</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ICMOBillList.aspx">
-      <publishTime>04/13/2022 10:14:38</publishTime>
+      <publishTime>04/22/2022 15:58:16</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
       <publishTime>02/10/2022 17:29:15</publishTime>
@@ -2355,7 +2355,7 @@
       <publishTime>02/17/2022 15:18:08</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/BatchGen_MouldFile.html">
-      <publishTime>03/30/2022 16:50:49</publishTime>
+      <publishTime>04/19/2022 16:10:41</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
       <publishTime>03/17/2022 14:11:22</publishTime>
@@ -2370,7 +2370,7 @@
       <publishTime>02/23/2022 18:01:22</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
-      <publishTime>03/30/2022 16:08:04</publishTime>
+      <publishTime>04/19/2022 10:46:38</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile_Edit.html">
       <publishTime>09/13/2021 09:24:54</publishTime>
@@ -2691,7 +2691,7 @@
       <publishTime>02/10/2022 17:29:15</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">
-      <publishTime>03/29/2022 15:12:53</publishTime>
+      <publishTime>04/22/2022 16:38:35</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">
       <publishTime>02/10/2022 17:29:15</publishTime>
@@ -2726,6 +2726,30 @@
     <File Include="views/鐢熶骇绠$悊/鎷f枡閰嶉�佸崟/JIT_ComplementGoodsList.html">
       <publishTime>04/01/2022 17:41:37</publishTime>
     </File>
+    <File Include="views/鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">
+      <publishTime>04/19/2022 10:43:59</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html">
+      <publishTime>04/19/2022 10:43:59</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇涓婃枡鍗�/Sc_MaterToSourceBillList - 澶嶅埗.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
@@ -2733,7 +2757,7 @@
       <publishTime>09/14/2021 08:59:03</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
-      <publishTime>04/11/2022 14:30:58</publishTime>
+      <publishTime>04/20/2022 19:38:09</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
@@ -2795,6 +2819,12 @@
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html">
       <publishTime>02/18/2022 16:21:15</publishTime>
     </File>
+    <File Include="views/鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
       <publishTime>02/10/2022 17:29:15</publishTime>
     </File>
@@ -2805,7 +2835,10 @@
       <publishTime>02/10/2022 17:29:15</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html">
-      <publishTime>03/17/2022 14:11:22</publishTime>
+      <publishTime>04/19/2022 10:43:59</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html">
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鐗╂枡娓呭崟/sc_Gy_ICBomBillMainList.html">
       <publishTime>02/10/2022 17:29:15</publishTime>
@@ -2828,8 +2861,14 @@
     <File Include="views/鐢熶骇绠$悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">
       <publishTime>02/10/2022 17:29:15</publishTime>
     </File>
+    <File Include="views/鐢熶骇绠$悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html">
+      <publishTime>04/19/2022 10:43:59</publishTime>
+    </File>
     <File Include="views/鐢熶骇绠$悊/缁勮鍗�/Sc_GroupOrderBillList.html">
       <publishTime>02/10/2022 17:29:15</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">
       <publishTime>09/09/2021 15:03:44</publishTime>
@@ -2839,6 +2878,12 @@
     </File>
     <File Include="views/鐢熶骇绠$悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">
       <publishTime>03/25/2022 10:56:40</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteMaterialDetailList.html">
+      <publishTime>04/22/2022 17:21:07</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">
       <publishTime>02/10/2022 17:29:15</publishTime>
@@ -2889,10 +2934,10 @@
       <publishTime>03/17/2022 14:11:22</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
-      <publishTime>02/18/2022 17:33:05</publishTime>
+      <publishTime>04/22/2022 17:21:07</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
-      <publishTime>02/18/2022 17:33:05</publishTime>
+      <publishTime>04/22/2022 17:21:07</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
       <publishTime>03/01/2022 17:51:08</publishTime>
@@ -3246,7 +3291,7 @@
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">
-      <publishTime>04/08/2022 15:47:53</publishTime>
+      <publishTime>04/21/2022 20:53:20</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
@@ -3255,7 +3300,7 @@
       <publishTime>04/01/2022 17:41:37</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
-      <publishTime>04/11/2022 14:30:58</publishTime>
+      <publishTime>04/13/2022 20:36:54</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">
       <publishTime>12/23/2021 15:43:26</publishTime>
@@ -3270,7 +3315,7 @@
       <publishTime>02/23/2022 14:26:14</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
-      <publishTime>04/11/2022 14:30:58</publishTime>
+      <publishTime>04/13/2022 20:36:54</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
       <publishTime>10/19/2021 16:08:25</publishTime>
@@ -3300,7 +3345,7 @@
       <publishTime>04/11/2022 14:30:58</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
-      <publishTime>04/11/2022 14:30:58</publishTime>
+      <publishTime>04/13/2022 20:36:54</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
       <publishTime>04/11/2022 14:30:58</publishTime>
@@ -3309,7 +3354,7 @@
       <publishTime>02/23/2022 14:26:14</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
-      <publishTime>04/11/2022 14:30:58</publishTime>
+      <publishTime>04/13/2022 20:36:54</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
       <publishTime>04/11/2022 14:30:58</publishTime>
@@ -3447,10 +3492,16 @@
       <publishTime>02/10/2022 17:29:15</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
-      <publishTime>03/09/2022 17:31:37</publishTime>
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">
       <publishTime>04/01/2022 15:23:44</publishTime>
+    </File>
+    <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_CheckList_New.html">
+      <publishTime>04/19/2022 10:43:59</publishTime>
+    </File>
+    <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_Check_New.html">
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">
       <publishTime>03/09/2022 17:31:37</publishTime>
@@ -3468,7 +3519,7 @@
       <publishTime>02/10/2022 17:29:15</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html">
-      <publishTime>03/17/2022 14:11:22</publishTime>
+      <publishTime>04/19/2022 10:43:59</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html">
       <publishTime>04/12/2022 10:19:27</publishTime>
@@ -3492,13 +3543,19 @@
       <publishTime>02/25/2022 18:33:51</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html">
-      <publishTime>04/01/2022 15:44:55</publishTime>
+      <publishTime>04/14/2022 15:14:40</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustOutBackBill.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
+    <File Include="views/楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html">
+      <publishTime>04/15/2022 16:02:25</publishTime>
+    </File>
+    <File Include="views/楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html">
+      <publishTime>04/15/2022 16:02:48</publishTime>
+    </File>
     <File Include="Web.config">
-      <publishTime>04/13/2022 10:17:06</publishTime>
+      <publishTime>04/22/2022 17:26:24</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e225d8f..61a1154 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -799,6 +799,7 @@
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_Add_ProductReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList_Web.html" />
+    <Content Include="views\鐢熶骇绠$悊\鍗虫椂搴撳瓨\JIT_InventoryList.html" />
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞EXecptFeedMessage.html" />
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞Sc_Add_MESExecptFeedBackBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillList.html" />
@@ -824,7 +825,14 @@
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
     <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎻愭枡璁″垝\JIT_LiftMaterPlaBillnList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎻愭枡璁″垝\JIT_LiftMaterPlanBillEdit.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Add.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBill_Add.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Add.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.html" />
@@ -841,6 +849,8 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇鏃ヨ鍒掑伐鍗昞JIT_DayPlanBillEdit.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇鏃ヨ鍒掑伐鍗昞JIT_DayPlanBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNewList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
@@ -852,9 +862,13 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
     <Content Include="views\鐢熶骇绠$悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
     <Content Include="views\鐢熶骇绠$悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\瑕佹枡璁″垝\JIT_NeedMaterPlanBillEdit.html" />
+    <Content Include="views\鐢熶骇绠$悊\瑕佹枡璁″垝\JIT_NeedMaterPlanBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\閫�鏂欑敵璇峰崟\JIT_CallGoodsBackRequestBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\榻愬鍒嗘瀽\JIT_CompleteMaterialDetailList.html" />
+    <Content Include="views\鐢熶骇绠$悊\榻愬鍒嗘瀽\JIT_CompleteDetailList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriodList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriod_Edit.html" />
     <Content Include="views\绯荤粺绠$悊\鍏憡\GG_NoticeBillList.html" />
@@ -1055,6 +1069,8 @@
     <Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBill_FastList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustOutBackBill.html" />
+    <Content Include="views\楠屾敹鍏ュ簱\濮斿鍑哄簱\Kf_EntrustOutBill_Fast.html" />
+    <Content Include="views\楠屾敹鍏ュ簱\濮斿鍑哄簱\Kf_EntrustOutBill_FastList.html" />
     <Content Include="Web.config" />
     <None Include="Properties\PublishProfiles\Web.pubxml" />
   </ItemGroup>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c147982..87674ea 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d2979ab..0e6ed35 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,13 +1,13 @@
 锘�
 function GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
-    var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
+    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
     //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
-    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
+    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
diff --git a/WebTM/views/PublicPage/PartInformation.html b/WebTM/views/PublicPage/PartInformation.html
index 4d368dc..e930c04 100644
--- a/WebTM/views/PublicPage/PartInformation.html
+++ b/WebTM/views/PublicPage/PartInformation.html
@@ -201,7 +201,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "where 1=1 ";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
             //浠ヤ笂鏄痩ayui妯″潡
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e9243e6..3b4c284 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -360,7 +360,41 @@
                                 <dd>
                                     <a>鏃ヨ鍒掑钩鍙�</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+                                        <dd>
+                                            <a>鏃ヨ鍒掑伐鍗�</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html">鏃ヨ鍒掑伐鍗�</a></dd>
+                                            </dl>
+                                        </dd>
+                                        <dd>
+                                            <a>瑕佹枡璁″垝</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
+                                            </dl>
+                                        </dd>
+                                        <dd>
+                                            <a>鎻愭枡璁″垝</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html">鎻愭枡璁″垝鍗�</a></dd>
+                                            </dl>
+                                        </dd>
+                                        <dd>
+                                            <a>鍩虹璧勬枡</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+                                            </dl>
+                                        </dd>
+                                        <dd>
+                                            <a>鍗虫椂搴撳瓨</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鍗虫椂搴撳瓨/JIT_InventoryList.html">鍗虫椂搴撳瓨鍒楄〃</a></dd>
+                                            </dl>
+                                        </dd>
                                     </dl>
                                 </dd>
                             </dl>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 5ba939d..7fa9838 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -496,9 +496,9 @@
                           </a>
                       </dd>
                       <dd>
-                          <a lay-href="" style="color: aqua;">
+                          <a lay-href="楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              濮斿棰嗘枡缂撳瓨鍒楄〃null
+                              濮斿棰嗘枡缂撳瓨鍒楄〃
                           </a>
                       </dd>
                       <dd>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 8c15345..a887f3d 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -113,7 +113,11 @@
                     if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                         var data = result.data;
                         for (var i = 0; i < data.length; i++) {
+                            if (i == 0)
+                                Organization += '<option  style="color:blue;"  value="' + data[i].ID + '" selected>' + data[i].Name + '</option>';
+                            else
                             Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+
                         }
                         $("#Organization").append(Organization);
                         form.render('select');
@@ -228,7 +232,7 @@
                 var audio = document.getElementById("cs");
                 audio.play();
             }
-           
+
         });
     </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/Gy_Currency.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/Gy_Currency.html"
index 95127ad..81eecec 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/Gy_Currency.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/Gy_Currency.html"
@@ -128,24 +128,24 @@
             //#endregion
 
             //#region 鍒濆鍖栬〃鏍�
-            $.ajax({
-                url: GetWEBURL() + '/Gy_Currency/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (result) {
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    var treeData = LoadTree(data);
-                    tree.render({
-                        elem: '#treeCurrency',
-                        data: treeData,
-                        id: 'treeId',
-                        disabled: 'disabled',
-                        showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
-                        showLine: false
-                    });
-                }
-            });
+            //$.ajax({
+            //    url: GetWEBURL() + '/Gy_Currency/LoadTree',
+            //    type: "GET",
+            //    data: { "sWhere": sWhere },
+            //    success: function (result) {
+            //        var data = result.data;
+            //        //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+            //        var treeData = LoadTree(data);
+            //        tree.render({
+            //            elem: '#treeCurrency',
+            //            data: treeData,
+            //            id: 'treeId',
+            //            disabled: 'disabled',
+            //            showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+            //            showLine: false
+            //        });
+            //    }
+            //});
             var option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
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_MouldScrapOutStockBill.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_MouldScrapOutStockBill.aspx"
index a9d79d1..e68c0d5 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_MouldScrapOutStockBill.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_MouldScrapOutStockBill.aspx"
@@ -4,20 +4,20 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+    <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 MAX(搴撳瓨缁勭粐)搴撳瓨缁勭粐,max(閮ㄩ棬鍚嶇О) 閮ㄩ棬,max(鍗曟嵁鍙�)鍗曟嵁鍙�,浠撳簱鍚嶇О,max(鏃ユ湡)鏃ユ湡,鐗╂枡浠g爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,max(璁¢噺鍗曚綅鍚嶇О)璁¢噺鍗曚綅,瀛愬娉�,瀹℃牳浜� from h_v_Sc_MouldScrapOutHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by 鐗╂枡浠g爜,瑙勬牸鍨嬪彿,鎵规,浠撳簱鍚嶇О,瀹℃牳浜� order by 鍗曟嵁鍙�");
-    }
-</script>
+            //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 MAX(搴撳瓨缁勭粐)搴撳瓨缁勭粐,max(閮ㄩ棬鍚嶇О) 閮ㄩ棬,max(鍗曟嵁鍙�)鍗曟嵁鍙�,浠撳簱鍚嶇О,max(鏃ユ湡)鏃ユ湡,鐗╂枡浠g爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,max(璁¢噺鍗曚綅鍚嶇О)璁¢噺鍗曚綅,瀛愬娉�,瀹℃牳浜� from h_v_Sc_MouldScrapOutHouseBillList where hmainid=" + Request.Params["linterid"] + " group by 鐗╂枡浠g爜,瑙勬牸鍨嬪彿,鎵规,浠撳簱鍚嶇О,瀛愬娉�,瀹℃牳浜� order by 鍗曟嵁鍙�");
+        }
+    </script>
 </head>
 <body>
     <form id="form1" runat="server">
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_ICMOBillList.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_ICMOBillList.aspx"
index ea93880..e5ec06c 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_ICMOBillList.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_ICMOBillList.aspx"
@@ -24,14 +24,14 @@
             }
             PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
     
-            string sql = string.Format(@"select convert(varchar,a.HDate ,23)鏃ユ湡,a.HBillNo 鍗曟嵁缂栧彿,M.HName 閿�鍞墿鏂欏悕绉�,c.HName 鏀惰揣鏂硅仈绯讳汉,b.HQty 閿�鍞暟閲�,u.HName 璐揣鍗曚綅 
+            string sql = string.Format(@"select convert(varchar,f.FSalOrderDate ,23) 閿�鍞鍗曟棩鏈�,a.HBillNo 鍗曟嵁缂栧彿,f.F_YQN_XSDD 閿�鍞鍗曠紪鍙�, f.F_zzzz_Text4  閿�鍞墿鏂欏悕绉�,f.F_zzzz_Text1  閿�鍞鍗曡仈绯讳汉,
+                                        f.F_BZFS 鍖呰鏂瑰紡,b.HQty 閿�鍞暟閲�,convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) 涓诲瓙鍗曞彿
                                             from Sc_ICMOBillMain a 
                                             left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
-                                            left join Gy_Material m on a.HMaterID=m.HItemID 
-                                            left join Gy_Customer c on a.HCusID=c.HItemID 
-                                            left join Gy_Unit u on a.HUnitID=u.HItemID 
-                                            where  convert(varchar(50),a.HInterID)+ Right('000000'+convert(varchar(50),b.HEntryID),7) in ("+ PrintIds+")");
-          
+											left join AIS20200908101915zs..T_PRD_MOENTRY f on b.HERPInterID=f.FID
+											left join Xs_SeOrderBillMain x on a.HSeOrderInterID=x.HInterID
+                                            where  convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ("+ PrintIds+") order by a.HInterID desc");
+            
             SqlXMLReportData.GenOneRecordset(this, sql);
         }
     </script>
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/BatchGen_MouldFile.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/BatchGen_MouldFile.html"
index fe3d390..8f70098 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.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/BatchGen_MouldFile.html"
@@ -85,6 +85,7 @@
                 }
                 var StarNum = $("#StarNum").val();
                 var EndNum = $("#EndNum").val();
+                $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                 //鏂板
                 $.ajax({
                     type: "Get",
@@ -94,11 +95,10 @@
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) {
-                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                if (linterid == undefined) {
-                                    $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
-                                }
-                                else {
+                            layer.msg(data.Message + "宸插瓨鍦ㄥ崟鎹彿锛�" + data.list, {
+                                btn: ['纭']
+                                , time: 100000, icon: 1
+                                , yes: function () {
                                     var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                                     parent.layer.close(index); //鍐嶆墽琛屽叧闂�
                                 }
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_MouldFile.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_MouldFile.html"
index a364a28..201799d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.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_MouldFile.html"
@@ -320,10 +320,16 @@
                                                 <input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏉$爜缂栧彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="background-color:#efefef4d;">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
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_MouldFileList.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_MouldFileList.html"
index d37d1cd..fb5074f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.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_MouldFileList.html"
@@ -129,6 +129,7 @@
                     //鍒濆鍖栨寜閽�
                     case 'get_Initialize': get_Initialize();
                         break;
+                    //鎵归噺鐢熸垚鎸夐挳
                     case 'get_BatchGen': get_BatchGen();
                         break;
                 };
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html"
new file mode 100644
index 0000000..de380f8
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html"
@@ -0,0 +1,231 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鍗虫椂搴撳瓨鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-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" style="width: 85px;">鐗╂枡缂栫爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="FMaterialNumber" id="FMaterialNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="FMaterialName" id="FMaterialName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">浠撳簱缂栫爜</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="FStockNumber" id="FStockNumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">浠撳簱鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="FStockName" id="FStockName">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#region 鐢熶骇杞﹂棿
+        form.on('submit(btnHWorkShopID)', function (data) {
+            btnHWorkShopID();
+        });
+        //#endregion
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true }
+                    , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿' }
+                    , { field: '浠撳簱ID', title: '浠撳簱ID', hide: true }
+                    , { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
+                    , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+                    , { field: '搴撳瓨涓诲崟浣岻D', title: '搴撳瓨涓诲崟浣岻D', hide: true }
+                    , { field: '鍗曚綅缂栫爜', title: '鍗曚綅缂栫爜' }
+                    , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' }
+                    , { field: '鎵瑰彿', title: '鎵瑰彿' }
+                    , { field: '鍙敤搴撳瓨閲�', title: '鍙敤搴撳瓨閲�' }
+                    , { field: '缁勭粐缂栫爜', title: '缁勭粐缂栫爜' }
+                    , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
+                    , { field: '璐т富绫诲瀷', title: '璐т富绫诲瀷' }
+                    , { field: '璐т富ID', title: '璐т富ID' }
+                    , { field: '璐т富缂栫爜', title: '璐т富缂栫爜' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/JIT_Complete/JIT_InventoryList',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+
+            var FMaterialNumber = $("#FMaterialNumber").val();
+            var FMaterialName = $("#FMaterialName").val();
+            var FStockNumber = $("#FStockNumber").val();
+            var FStockName = $("#FStockName").val();
+
+            if (FMaterialNumber) {
+                sWhere += " and 鐗╂枡缂栫爜 like '%" + FMaterialNumber + "%'";
+            }
+            if (FMaterialName) {
+                sWhere += " and 鐗╂枡鍚嶇О like '%" + FMaterialName + "%'";
+            }
+            if (FStockNumber) {
+                sWhere += " and 浠撳簱缂栫爜 like '%" + FStockNumber + "%'";
+            }
+            if (FStockName) {
+                sWhere += " and 浠撳簱鍚嶇О like '%" + FStockName + "%'";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#FMaterialNumber").val("");
+            $("#FMaterialName").val("");
+            $("#FStockNumber").val("");
+            $("#FStockName").val("");
+            sWhere = "";
+        }
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index daa8289..5cdb0ae 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -203,7 +203,7 @@
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">婧愬崟琛屽彿:</label>
                                                         <div class="layui-input-inline">
-                                                            <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" autocomplete="off" disabled>
+                                                            <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" autocomplete="off">
                                                         </div>
                                                     </div>
                                                 </div>
@@ -426,7 +426,7 @@
             {
                 refSav = "Add";
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
-                $("#HMainSourceBillNo").focus();
+                $("#HMainSourceEntryID").focus();
                 //鍒濆鍩烘湰淇℃伅璧嬪��
                 $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
                 $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�宸ユ棩鏈�
@@ -452,12 +452,12 @@
                 $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
 
                 //鎵簩缁寸爜鏂规硶
-                $('#HMainSourceBillNo').on('keydown', function (event) {   //鎵簮鐮�
-                    var HBarCode = $('#HMainSourceBillNo').val();
+                $('#HMainSourceEntryID').on('keydown', function (event) {   //鎵簮鐮�
+                    var HBarCode = $('#HMainSourceEntryID').val();
                     if (event.keyCode == 13) {
                         //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
                         if (HBarCode == "") {
-                            layer.alert("婧愮爜涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            layer.alert("婧愬崟琛屽彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                             return;
                         }
                         //
@@ -482,7 +482,7 @@
                                         , "HDeptID": data.HDeptID
                                         , "HDeptName": data.鐢熶骇杞﹂棿
                                         , "HMainSourceInterID": data.hmainid
-                                        , "HMainSourceEntryID": data.HEntryID
+                                        , "HMainSourceBillNo": data.鍗曟嵁鍙�
                                         , "HMainSourceBillType": "3710"
                                         , "HICMOInterID": "0"
                                         , "HICMOEntryID": "0"
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
new file mode 100644
index 0000000..fbdf895
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -0,0 +1,432 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎻愭枡璁″垝鍗曞垪琛�</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-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" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">閲囪喘缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="Organization" id="Organization" lay-verify="Organization">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <!--鍏朵粬鏉′欢-->
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+                //鍏抽棴
+                case 'set_CloseBill': set_CloseBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 鐢熶骇杞﹂棿
+        form.on('submit(btnHWorkShopID)', function (data) {
+            btnHWorkShopID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鐢熶骇缁勭粐鍔犺浇
+            Organ();
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', hide: true }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
+                    , { 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: '閲囪喘缁勭粐' }
+                    , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟�' }
+                    , { field: '婧愬崟鍗曞彿', title: '鐢熶骇璁㈠崟鍙�' }
+                    , { field: '鏁伴噺', title: '鏁伴噺' }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                    , { field: '宸ュ崟鐢熶骇鏃ユ湡', title: '宸ュ崟鐢熶骇鏃ユ湡' }
+                    , { field: '寤惰繜鍘熷洜', title: '寤惰繜鍘熷洜' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '<option  style="color:blue;" value="">缁勭粐</option>';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#Organization").append(Organization);
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var Organization = $("#Organization").val();//閲囪喘缁勭粐
+            var HWorkShopIDName = $("#HWorkShopIDName").val();//鐢熶骇杞﹂棿
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (Organization) {
+                sWhere += " and 涓昏〃閲囪喘缁勭粐 = '" + Organization + "'";
+            }
+            if (HWorkShopIDName) {
+                sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "'";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HBillNo").val("");
+            $("#Organization").val("");//閲囪喘缁勭粐
+            $("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
+            $("#HWorkShopID").val("");//鐢熶骇杞﹂棿
+            sWhere = "";
+        }
+        //#endregion
+
+        //鐢熶骇杞﹂棿鍒楄〃
+        function btnHWorkShopID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/DelPODemandPlanBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //鍏抽棴
+        function set_CloseBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+                        $.ajax({
+                            url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/ClosePODemandPlanBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '鎻愭枡璁″垝鍗曞垪琛�-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+            //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鎻愭枡璁″垝鍗曞垪琛�-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
new file mode 100644
index 0000000..ea6df00
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -0,0 +1,1019 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎻愭枡璁″垝鍗曟柊澧�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">濮斿缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HSubORGID" id="HSubORGID" lay-verify="HSubORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浜よ揣鍦扮偣</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HAddress" name="HAddress" id="HAddress">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">閲囪喘缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPURCHASEORGID" id="HPURCHASEORGID" lay-verify="HPURCHASEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HSupplierID" name="HSupplierID" id="HSupplierID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HSupplierIDName" name="HSupplierIDName" id="HSupplierIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupplierID" id="btnHSupplierID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁撶畻甯佸埆</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HSettleCurrId" name="HSettleCurrId" id="HSettleCurrId" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HSettleCurrIdName" name="HSettleCurrIdName" id="HSettleCurrIdName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSettleCurrId" id="btnHSettleCurrId" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎻愭枡鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎽樿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HExplanation" name="HExplanation" id="HExplanation">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(寤惰繜鍘熷洜)-->
+    <script type="text/html" id="HLaterReason">
+        <select name="HLaterReason" lay-filter="HLaterReason" id="HLaterReason{{d.LAY_TABLE_INDEX+1}}">
+            <option value=""></option>
+            <option value="璁捐鍙樻洿鍥犵礌褰卞搷">璁捐鍙樻洿鍥犵礌褰卞搷</option>
+            <option value="妯″叿璁惧褰卞搷">妯″叿璁惧褰卞搷</option>
+            <option value="蹇�掔墿娴佸奖鍝�">蹇�掔墿娴佸奖鍝�</option>
+            <option value="浜у搧璐ㄩ噺闂">浜у搧璐ㄩ噺闂</option>
+            <option value="鍘熸枡澶囪揣寤舵湡">鍘熸枡澶囪揣寤舵湡</option>
+            <option value="浜哄憳浜ц兘涓嶈冻">浜哄憳浜ц兘涓嶈冻</option>
+            <option value="涓嶅彲鎶楀姏鍥犵礌">涓嶅彲鎶楀姏鍥犵礌</option>
+        </select>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(鐗╂枡灞炴��)-->
+    <script type="text/html" id="HErpClsID">
+        <select name="HErpClsID" lay-filter="HErpClsID" id="HErpClsID{{d.LAY_TABLE_INDEX+1}}">
+            <option value=""></option>
+            <option value="澶栬喘">澶栬喘</option>
+            <option value="鑷埗">鑷埗</option>
+            <option value="濮斿">濮斿</option>
+            <option value="閰嶇疆">閰嶇疆</option>
+            <option value="璧勪骇">璧勪骇</option>
+            <option value="鐗瑰緛">鐗瑰緛</option>
+            <option value="璐圭敤">璐圭敤</option>
+            <option value="铏氭嫙">铏氭嫙</option>
+            <option value="鏈嶅姟">鏈嶅姟</option>
+            <option value="涓�娆℃��">涓�娆℃��</option>
+            <option value="妯″瀷">妯″瀷</option>
+            <option value="浜у搧绯诲垪">浜у搧绯诲垪</option>
+            <option value="鍏朵粬">鍏朵粬</option>
+        </select>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(鐘舵��)-->
+    <script type="text/html" id="HStatus">
+        <select name="HStatus" lay-filter="HStatus" id="HStatus{{d.LAY_TABLE_INDEX+1}}">
+            <option value=""></option>
+            <option value="纭">纭</option>
+            <option value="鏈‘璁�">鏈‘璁�</option>
+        </select>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(閲囪喘缁勭粐)-->
+    <script type="text/html" id="HPURCHASEORGIDSub">
+        <select name="HPURCHASEORGIDSub" lay-filter="HPURCHASEORGIDSub" id="HPURCHASEORGIDSub{{d.LAY_TABLE_INDEX+1}}">
+            <option value=""></option>
+            <option value="1">钃濇捣瀹炰笟闆嗗洟</option>
+            <option value="100035">钃濇捣閫氳鍏徃</option>
+            <option value="100037">閫氳鍏徃鏈儴</option>
+            <option value="100038">鎵嬫満浜嬩笟閮�</option>
+            <option value="100039">骞虫澘浜嬩笟閮�</option>
+            <option value="100040">钃濇捣鐢靛瓙鍏徃</option>
+            <option value="100041">钃濇捣閿�鍞叕鍙�</option>
+            <option value="100042">棣欐腐閿�鍞叕鍙�</option>
+            <option value="100043">钃濇捣鐢靛瓙鍟嗗姟鏈夐檺鍏徃</option>
+            <option value="100044">钃濇捣闆跺敭杩為攣鍏徃</option>
+            <option value="100045">骞垮窞闂ㄥ簵</option>
+            <option value="100046">娣卞湷闂ㄥ簵</option>
+            <option value="100047">鏉窞鍗庡畯閫氫俊璁惧鏈夐檺鍏徃</option>
+        </select>
+    </script>
+
+    <!--澶嶉�夋 鍏抽棴鐘舵��-->
+    <script type="text/html" id="HCloseStatus">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HCloseStatus" lay-filter="HCloseStatus" id="HCloseStatus{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+
+    <!--澶嶉�夋 鏄惁鎵嬪伐鍏抽棴-->
+    <script type="text/html" id="HCloseTypeSub">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HCloseTypeSub" lay-filter="HCloseTypeSub" id="HCloseTypeSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+                , "HErpClsID": "", "HQty": "", "HRemark": "", "HPURCHASEORGID": "", "HStatus": "", "HFixleadTime": ""
+                , "HDayPlanBillNo": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "", "HWorkShopID": ""
+                , "HWorkShopIDName": "", "HDayPlanDate": "", "HRelationQty1": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": ""
+                , "HPOOrderBillSEQ": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HPurchaseDeptID": ""
+                , "HPurchaseDeptIDName": "", "HCloseTypeSub": false, "HCloseMan": "", "HEntryCloseDate": "", "HSendQty": "", "HReciveQty": ""
+                , "HCloseStatus": false, "HRemoveQty": "", "HSeOrderBillNo": "", "HUnReciveQty": "", "HPOOrderBillDate": "", "HPOOrderBillDeliveryDate": ""
+                , "HPOOrderBillRemark": "", "HPOOrderBillNote": ""
+            }];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍔犺浇缁勭粐
+            get_Organ();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == -1) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4608' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 'full-270'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HLaterReason', title: '寤惰繜鍘熷洜', templet: '#HLaterReason', width: 200 }//list
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                    , { field: 'HUnitIDName', title: '璁¢噺鍗曚綅', edit: 'text', event: "HUnitID" }
+                    , { field: 'HErpClsID', title: '鐗╂枡灞炴��', templet: '#HErpClsID' }//list
+                    , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { field: 'HPURCHASEORGID', title: '閲囪喘缁勭粐', templet: "#HPURCHASEORGIDSub" }
+                    , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }//list
+                    , { field: 'HFixleadTime', title: '鎻愬墠鏈�', edit: 'text' }
+                    , { field: 'HDayPlanBillNo', title: '鏃ヨ鍒掑伐鍗曠紪鍙�', edit: 'text' }
+                    , { field: 'HSourceInterID', title: '鏃ヨ鍒掑伐鍗旻ID', edit: 'text' }
+                    , { field: 'HSourceEntryID', title: '鏃ヨ鍒掑伐鍗旻ENTRYID', width: 200, edit: 'text' }
+                    , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text' }
+                    , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
+                    , { field: 'HWorkShopIDName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HWorkShopID" }
+                    , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, event: 'HDayPlanDate' }//date
+                    , { field: 'HRelationQty1', title: '鍙敤閲囪喘鏁伴噺', edit: 'text' }
+                    , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', edit: 'text' }
+                    , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', edit: 'text' }
+                    , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', edit: 'text' }
+                    , { field: 'HPOOrderBillSEQ', title: '閲囪喘璁㈠崟琛屽彿', edit: 'text' }
+                    , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟鍐呯爜', edit: 'text' }
+                    , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', edit: 'text' }
+                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟', edit: 'text' }
+                    , { field: 'HPurchaseDeptID', title: 'HPurchaseDeptID', hide: true }
+                    , { field: 'HPurchaseDeptIDName', title: '閲囪喘閮ㄩ棬', edit: 'text', event: "HPurchaseDeptID" }
+                    , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: "#HCloseTypeSub" }//ck
+                    , { field: 'HCloseMan', title: '琛屽叧闂�', width: 200, edit: 'text' }
+                    , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', width: 200, event: 'HEntryCloseDate' }//date
+                    , { field: 'HSendQty', title: '閫佽揣鍗曟暟閲�', edit: 'text' }
+                    , { field: 'HReciveQty', title: '鏀舵枡鏁伴噺', edit: 'text' }
+                    , { field: 'HCloseStatus', title: '鍏抽棴鐘舵��', templet: "#HCloseStatus" }//ck
+                    , { field: 'HRemoveQty', title: '杞Щ鏁伴噺', edit: 'text' }
+                    , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text' }
+                    , { field: 'HUnReciveQty', title: '鏈敹鏂欐暟閲�', edit: 'text' }
+                    , { field: 'HPOOrderBillDate', title: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡', event: "HPOOrderBillDate", width: 200 }//date
+                    , { field: 'HPOOrderBillDeliveryDate', title: '閲囪喘璁㈠崟浜よ揣鏃ユ湡', event: "HPOOrderBillDeliveryDate", width: 200 } // date
+                    , { field: 'HPOOrderBillRemark', title: '閲囪喘璁㈠崟鎽樿', edit: 'text' }
+                    , { field: 'HPOOrderBillNote', title: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫夋嫨渚涘簲鍟嗘寜閽�
+            form.on('submit(btnHSupplierID)', function () {
+                get_btnHSupplierID();
+            });
+
+            //閫夋嫨甯佸埆鎸夐挳
+            form.on('submit(btnHSettleCurrId)', function () {
+                get_btnHSettleCurrId();
+            });
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+                    , "HErpClsID": "", "HQty": "", "HRemark": "", "HPURCHASEORGID": "", "HStatus": "", "HFixleadTime": ""
+                    , "HDayPlanBillNo": "", "HSourceInterID": 0, "HSourceEntryID":0, "HSourceBillNo": "", "HSourceBillType": "", "HWorkShopID": ""
+                    , "HWorkShopIDName": "", "HDayPlanDate": "", "HRelationQty1": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": ""
+                    , "HPOOrderBillSEQ": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HPurchaseDeptID": ""
+                    , "HPurchaseDeptIDName": "", "HCloseTypeSub": false, "HCloseMan": "", "HEntryCloseDate": "", "HSendQty": "", "HReciveQty": ""
+                    , "HCloseStatus": false, "HRemoveQty": "", "HSeOrderBillNo": "", "HUnReciveQty": "", "HPOOrderBillDate": "", "HPOOrderBillDeliveryDate": ""
+                    , "HPOOrderBillRemark": "", "HPOOrderBillNote": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+
+                        //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+                        checkRefresh();
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                            //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+                            checkRefresh();
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                //#region 鏃堕棿鎺т欢 缁戝畾
+
+                var data = obj.data;
+                //鏃ヨ鍒掔敓浜ф棩鏈�
+                if (obj.event == 'HDayPlanDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //琛屽叧闂棩鏈�
+                if (obj.event == 'HEntryCloseDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //閲囪喘璁㈠崟鍗曟嵁鏃ユ湡
+                if (obj.event == 'HPOOrderBillDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //閲囪喘璁㈠崟浜よ揣鏃ユ湡
+                if (obj.event == 'HPOOrderBillDeliveryDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //#endregion
+
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linterid == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData()) {
+                    set_AddNew(data);
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                }
+            });
+
+            //琛岄�夋嫨澶勭悊锛堝欢杩熷師鍥狅級
+            form.on('select(HLaterReason)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HLaterReason = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //琛岄�夋嫨澶勭悊锛堢墿鏂欏睘鎬э級
+            form.on('select(HErpClsID)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HErpClsID = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+            form.on('select(HStatus)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //琛岄�夋嫨澶勭悊锛堥噰璐粍缁囷級
+            form.on('select(HPURCHASEORGIDSub)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                  
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HPURCHASEORGID = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //鍏抽棴鐘舵��
+            form.on('checkbox(HCloseStatus)', function (data) {
+                //鑾峰彇閫変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HCloseStatus = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //鏄惁鎵嬪伐鍏抽棴
+            form.on('checkbox(HCloseTypeSub)', function (data) {
+                //鑾峰彇閫変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HCloseTypeSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //缁勭粐閫夋嫨椤甸潰
+            function get_Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '<option  style="color:blue;" value="0">缁勭粐</option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPURCHASEORGID").append(Organization);
+                            $("#HSubORGID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //澶氶��  鍒锋柊琛ㄦ牸
+            function checkRefresh() {
+                for (var i = 1; i <= option.data.length; i++) {
+                    console.log(JSON.stringify(option.data[i - 1]))
+                    //寤惰繜鍘熷洜
+                    $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
+                    //鐗╂枡灞炴��
+                    $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
+                    //鐘舵��
+                    $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+                    //閲囪喘缁勭粐
+                    $('#HPURCHASEORGIDSub' + i + '').find("option[value='" + option.data[i - 1].HPURCHASEORGID + "']").attr("selected", true);
+
+                    //鍏抽棴鐘舵��
+                    if (option.data[i - 1].HCloseStatus) {
+                        $('#HCloseStatus' + i + '').attr("checked", true);
+                    }
+
+                    //鏄惁鎵嬪伐鍏抽棴
+                    if (option.data[i - 1].HCloseTypeSub) {
+                        $('#HCloseTypeSub' + i + '').attr("checked", true);
+                    }
+                }
+                form.render('select');
+                form.render('checkbox');
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //閫夋嫨渚涘簲鍟�
+            function get_btnHSupplierID() {
+                //鎵撳紑渚涘簲鍟嗗皬绐椾綋
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "渚涘簲鍟嗗垪琛�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        $("#HSupplierID").val(checkStatus.data[0].HItemID);
+                        $("#HSupplierIDName").val(checkStatus.data[0].HName);
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //閫夋嫨甯佸埆
+            function get_btnHSettleCurrId() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "甯佸埆鍒楄〃"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        $("#HSettleCurrId").val(checkStatus.data[0].HItemID);
+                        $("#HSettleCurrIdName").val(checkStatus.data[0].璐у竵鍚嶇О);
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //琛屽揩鎹烽敭
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            //鎵撳紑鐗╂枡  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterNumber": checkStatus.data[0].HNumber
+                                        , "HMaterName": checkStatus.data[0].HName
+                                        , "HMaterModel": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+
+                        //璁¢噺鍗曚綅
+                        if (obj.event == "HUnitID") {
+                            //鎵撳紑璁¢噺鍗曚綅灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_UnitList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HUnitID": checkStatus.data[0].HItemID
+                                        , "HUnitIDName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+
+                        //鐢熶骇杞﹂棿
+                        if (obj.event == "HWorkShopID") {
+                            //鎵撳紑鐢熶骇杞﹂棿灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐢熶骇杞﹂棿鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HWorkShopID": checkStatus.data[0].HItemID
+                                        , "HWorkShopIDName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+
+                        //閲囪喘閮ㄩ棬
+                        if (obj.event == "HPurchaseDeptID") {
+                            //鎵撳紑閲囪喘閮ㄩ棬灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "閮ㄩ棬鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HPurchaseDeptID": checkStatus.data[0].HItemID
+                                        , "HPurchaseDeptIDName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HSubORGID": d.data[0].濮斿缁勭粐
+                            , "HAddress": d.data[0].浜よ揣鍦扮偣
+                            , "HPURCHASEORGID": d.data[0].涓昏〃閲囪喘缁勭粐
+                            , "HSupplierID": d.data[0].HSupplierID
+                            , "HSupplierIDName": d.data[0].渚涘簲鍟嗗悕绉�
+                            , "HSettleCurrId": d.data[0].HSettleCurrId
+                            , "HSettleCurrIdName": d.data[0].缁撶畻甯佸埆
+                            , "HDate": Format(new Date(d.data[0].鏃ユ湡),'yyyy-MM-dd')
+                            , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            , "HExplanation": d.data[0].鎽樿
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠g爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
+                            , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁¢噺鍗曚綅
+                            , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[0].瀛愯〃閲囪喘缁勭粐
+                            , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�
+                            , "HDayPlanBillNo": d.data[0].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
+                            , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[0].HWorkShopID
+                            , "HWorkShopIDName": d.data[0].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[0].鍙敤閲囪喘鏁伴噺
+                            , "HPOOrderInterID": d.data[0].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[0].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[0].閲囪喘璁㈠崟鍙�
+                            , "HPOOrderBillSEQ": d.data[0].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[0].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[0].濮斿璁㈠崟瀛愬唴鐮�
+                            , "HWWOrderBillNo": d.data[0].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[0].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[0].閲囪喘閮ㄩ棬
+                            , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[0].閫佽揣鍗曟暟閲�
+                            , "HReciveQty": d.data[0].鏀舵枡鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿
+                            , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[0].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[0].閲囪喘璁㈠崟浜よ揣鏃ユ湡),'yyyy-MM-dd')
+                            , "HPOOrderBillRemark": d.data[0].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[0].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+
+                        //鏄惁鎵嬪伐鍏抽棴
+                        if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
+                            $('#HCloseTypeSub1').attr("checked", true);
+                        }
+
+                        //鍏抽棴鐘舵��
+                        if (d.data[0].鍏抽棴鐘舵�� == "1") {
+                            $('#HCloseStatus1').attr("checked", true);
+                        }
+                        form.render('checkbox');
+
+                        //寤惰繜鍘熷洜
+                        $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
+                        $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
+                        $('#HPURCHASEORGIDSub1').find("option[value='" + d.data[0].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
+                        $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        //鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
+                        if (table.cache["mainTable"][i].HEntryCloseDate == "") {
+                            table.cache["mainTable"][i].HEntryCloseDate = "1900-01-01 00:00:00.000"
+                        }
+
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/JIT_Cg_PODemandPlanBill/AddPODemandPlanBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //闈炵┖楠岃瘉
+            function AllowLoadData() {
+
+                if ($("#HSettleCurrId").val() == "") {
+                    layer.msg("甯佸埆娌℃湁閫夋嫨");
+                    return false;
+                }
+                return true;
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
new file mode 100644
index 0000000..f972ac6
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -0,0 +1,439 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎻愭枡璁″垝淇℃伅鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-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" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HSupplierID" name="HSupplierID" id="HSupplierID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HSupplierIDName" name="HSupplierIDName" id="HSupplierIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupplierID" id="btnHSupplierID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 渚涘簲鍟�
+        form.on('submit(btnHSupplierID)', function (data) {
+            btnHSupplierID();
+        });
+        //#endregion
+
+        //#region 鐗╂枡
+        form.on('submit(btnHMaterID)', function (data) {
+            btnHMaterID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', hide: true }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
+                    , { 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: '涓绘簮鍗曠被鍨�' }
+                    //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+                    //, { field: '婧愬崟鍙�', title: '婧愬崟鍙�' }
+                    //, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
+                    , { field: '缁勭粐', title: '缁勭粐' }
+                    , { field: '鏁版嵁鐘舵��', title: '鏁版嵁鐘舵��' }
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                    //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                    //, { field: '婧愬崟ID', title: '婧愬崟ID' }
+                    //, { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D' }
+                    //, { field: '瀛愭簮鍗曠被鍨�', title: '瀛愭簮鍗曠被鍨�' }
+                    , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                    , { field: 'JIT鐗╂枡鍒嗙被', title: 'JIT鐗╂枡鍒嗙被' }
+                    , { field: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', title: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�' }
+                    , { field: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', title: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�' }
+                    , { field: 'JIT鎻愯揣鎵归噺', title: 'JIT鎻愯揣鎵归噺' }
+                    , { field: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡' }
+                    , { field: 'JIT渚涜揣鎻愬墠鏈�', title: 'JIT渚涜揣鎻愬墠鏈�' }
+                    , { field: 'JIT鍒拌揣鍓嶇疆鏈�', title: 'JIT鍒拌揣鍓嶇疆鏈�' }
+                    , { field: 'JIT閫佽揣鏂瑰紡', title: 'JIT閫佽揣鏂瑰紡' }
+                    , { field: 'JIT閫佽揣鎺у埗澶╂暟', title: 'JIT閫佽揣鎺у埗澶╂暟' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var HSupplierIDName = $("#HSupplierIDName").val();//渚涘簲鍟�
+            var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+            var HMaterModel = $("#HMaterModel").val();//瑙勬牸鍨嬪彿
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%' ";
+            }
+            if (HSupplierIDName) {
+                sWhere += " and 渚涘簲鍟嗗悕绉� = '" + HSupplierIDName + "' ";
+            }
+            if (HMaterName) {
+                sWhere += " and 鐗╂枡鍚嶇О = '" + HMaterName + "' ";
+            }
+            if (HMaterNumber) {
+                sWhere += " and 鐗╂枡浠g爜 = '" + HMaterNumber + "' ";
+            }
+            if (HMaterModel) {
+                sWhere += " and 瑙勬牸鍨嬪彿 = '" + HMaterModel + "' ";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HBillNo").val("");
+            $("#HSupplierID").val("");
+            $("#HSupplierIDName").val("");
+            $("#HMaterID").val("");
+            $("#HMaterName").val("");
+            $("#HMaterNumber").val("");
+            $("#HMaterModel").val("");
+            sWhere = "";
+        }
+        //#endregion
+
+        //渚涘簲鍟嗗垪琛�
+        function btnHSupplierID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HSupplierID").val(checkStatus.data[0].HItemID);//渚涘簲鍟唅d
+                    $("#HSupplierIDName").val(checkStatus.data[0].HName);//渚涘簲鍟嗗悕绉�
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鐗╂枡鍒楄〃
+        function btnHMaterID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+                    $("#HMaterModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/DelPODemandPlanConfigBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '鎻愭枡璁″垝淇℃伅鍒楄〃-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+        //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鎻愭枡璁″垝淇℃伅鍒楄〃-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
new file mode 100644
index 0000000..19ccd2f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -0,0 +1,490 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎻愭枡璁″垝淇℃伅鏂板</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HSupplierID": "", "HSupplierNumber": "", "HSupplierName": "", "HMaterID": "","HMaterNumber":"", "HMaterName": "", "HMaterModel": ""
+                , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
+                , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+            }];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍔犺浇缁勭粐
+            get_Organ();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4611' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 'full-170'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HSupplierID', title: 'HSupplierID', hide: true }
+                    , { field: 'HSupplierNumber', title: '渚涘簲鍟�', edit: 'text', event: "HSupplierID" }
+                    , { field: 'HSupplierName', title: '渚涘簲鍟嗗悕绉�' }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡', edit: 'text', event: "HMaterID" }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿'}
+                    , { field: 'HJITMaterGroup', title: 'JIT鐗╂枡鍒嗙被', edit: 'text' }
+                    , { field: 'HJITSafeStock', title: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', edit: 'text', width: 200 }
+                    , { field: 'HJITMaterDemand', title: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', edit: 'text', width:200}
+                    , { field: 'HJITBatchQty', title: 'JIT鎻愯揣鎵归噺', edit: 'text' }
+                    , { field: 'HDeliveryPeriod', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', edit: 'text', width: 200}
+                    , { field: 'HLeadTime', title: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', edit: 'text', width: 200 }
+                    , { field: 'HLeadTime_Sec', title: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', edit: 'text', width: 200}
+                    , { field: 'HDeliveryMode', title: 'JIT閫佽揣鏂瑰紡', edit: 'text' }
+                    , { field: 'HDeliveryDaysCtrl', title: 'JIT閫佽揣鎺у埗澶╂暟', edit: 'text', width: 200 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HSupplierID": "","HSupplierNumber":"", "HSupplierName": "", "HMaterID": "","HMaterNumber":"", "HMaterName": "", "HMaterModel": ""
+                    , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
+                    , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+
+                        form.render('select');
+                        form.render('checkbox');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            form.render('select');
+                            form.render('checkbox');
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_AddNew(data);
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //缁勭粐閫夋嫨椤甸潰
+            function get_Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPRDORGID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽揩鎹烽敭
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //渚涘簲鍟�
+                        if (obj.event == "HSupplierID") {
+                            //鎵撳紑渚涘簲鍟嗗皬绐椾綋
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "渚涘簲鍟嗗垪琛�"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HSupplierID": checkStatus.data[0].HItemID
+                                        , "HSupplierNumber": checkStatus.data[0].HNumber
+                                        , "HSupplierName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            //鎵撳紑鐗╂枡  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterNumber": checkStatus.data[0].HNumber
+                                        , "HMaterName": checkStatus.data[0].HName
+                                        , "HMaterModel": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HPRDORGID": d.data[0].缁勭粐
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[0].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠g爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
+                            , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+                            , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/AddPODemandPlanConfigBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
index fe1cda7..655402a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
@@ -43,33 +43,40 @@
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
                                 <!--<div class="layui-colla-content">
-        <div class="layui-inline">
-            <div class="layui-inline">
-                <span>鍏朵粬鏉′欢></span>
-            </div>
-        </div>
-        <div class="layui-inline">
-            <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
-            <div class="layui-input-block" style="margin-left: 120px;">
-                <input type="text" class="layui-input" name="鐗╂枡浠g爜" id="鐗╂枡浠g爜">
-            </div>
-        </div>
-        <div class="layui-inline">
-            <label class="layui-form-label" style="width: 85px;">璧勬簮浠g爜</label>
-            <div class="layui-input-block" style="margin-left: 120px;">
-                <input type="text" class="layui-input" name="璧勬簮浠g爜" id="璧勬簮浠g爜">
-            </div>
-        </div>
-        <div class="layui-inline">
-            <label class="layui-form-label" style="width: 85px;">閮ㄩ棬浠g爜</label>
-            <div class="layui-input-block" style="margin-left: 120px;">
-                <input type="text" class="layui-input" name="閮ㄩ棬浠g爜" id="閮ㄩ棬浠g爜">
-            </div>
-        </div>
-    </div>-->
+                <div class="layui-inline">
+                    <div class="layui-inline">
+                        <span>鍏朵粬鏉′欢></span>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="鐗╂枡浠g爜" id="鐗╂枡浠g爜">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">璧勬簮浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="璧勬簮浠g爜" id="璧勬簮浠g爜">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">閮ㄩ棬浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="閮ㄩ棬浠g爜" id="閮ㄩ棬浠g爜">
+                    </div>
+                </div>
+            </div>-->
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                            </div>
+                        </script>
                     </form>
                 </div>
             </div>
@@ -110,6 +117,22 @@
         //#endregion
 
         //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#endregion
 
         //#region 鐢熶骇杞﹂棿
         form.on('submit(btnHWorkShopID)', function (data) {
@@ -159,7 +182,7 @@
                     , { field: '鏃ユ湡', title: '鏃ユ湡' }
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
                     , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                    //, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
                     , { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
                     , { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�' }
                     , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
@@ -173,17 +196,17 @@
                     , { 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: '婧愬崟ID', title: '婧愬崟ID' }
-                    , { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D' }
-                    , { field: '瀛愭簮鍗曠被鍨�', title: '瀛愭簮鍗曠被鍨�' }
+                    //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                    //, { field: '婧愬崟ID', title: '婧愬崟ID' }
+                    //, { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D' }
+                    //, { field: '瀛愭簮鍗曠被鍨�', title: '瀛愭簮鍗曠被鍨�' }
                     , { field: '杞﹂棿浠g爜', title: '杞﹂棿浠g爜' }
                     , { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О' }
                     , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜' }
@@ -270,6 +293,88 @@
 
         }
 
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/DelComplementGoodBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+            //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
         //#endregion
         //浠ヤ笂鏄痩ayui妯″潡
     });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
new file mode 100644
index 0000000..980d784
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -0,0 +1,474 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>杞﹂棿浠撳簱瀵圭収鏂板</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": "","HWHNumber":"", "HWHName": "", "HRemark": ""
+            }];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍔犺浇缁勭粐
+            get_Organ();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4612' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 'full-170'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
+                    , { field: 'HWorkShopNumber', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HWorkShopID" }
+                    , { field: 'HWorkShopName', title: '杞﹂棿鍚嶇О' }
+                    , { field: 'HWHID', title: 'HWHID', hide: true }
+                    , { field: 'HWHNumber', title: '浠撳簱', edit: 'text', event: "HWHID" }
+                    , { field: 'HWHName', title: '浠撳簱鍚嶇О' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": "","HWHNumber":"", "HWHName": "", "HRemark": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+                     
+                        form.render('select');
+                        form.render('checkbox');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            form.render('select');
+                            form.render('checkbox');
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_AddNew(data);
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //缁勭粐閫夋嫨椤甸潰
+            function get_Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPRDORGID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽揩鎹烽敭
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //鐢熶骇杞﹂棿
+                        if (obj.event == "HWorkShopID") {
+                            //鎵撳紑鐢熶骇杞﹂棿灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐢熶骇杞﹂棿鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HWorkShopID": checkStatus.data[0].HItemID
+                                        , "HWorkShopNumber": checkStatus.data[0].HNumber
+                                        , "HWorkShopName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //浠撳簱
+                        if (obj.event == "HWHID") {
+                            //鎵撳紑浠撳簱  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "浠撳簱鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HWHID": checkStatus.data[0].HItemID
+                                        , "HWHNumber": checkStatus.data[0].HNumber
+                                        , "HWHName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/ComplementGoodBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HPRDORGID": d.data[0].缁勭粐
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿浠g爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HWHID": d.data[0].HWHID
+                            , "HWHNumber": d.data[0].浠撳簱浠g爜, "HWHName": d.data[0].浠撳簱鍚嶇О, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/AddComplementGoodBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
new file mode 100644
index 0000000..b905ea7
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
@@ -0,0 +1,439 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>瑕佹枡璁″垝淇℃伅鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-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" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHHWorkShopID" id="btnHSupplierID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 杞﹂棿
+        form.on('submit(btnHHWorkShopID)', function (data) {
+            btnHHWorkShopID();
+        });
+        //#endregion
+
+        //#region 鐗╂枡
+        form.on('submit(btnHMaterID)', function (data) {
+            btnHMaterID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', hide: true }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
+                    , { 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: '涓绘簮鍗曠被鍨�' }
+                    //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+                    //, { field: '婧愬崟鍙�', title: '婧愬崟鍙�' }
+                    //, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
+                    , { field: '缁勭粐', title: '缁勭粐' }
+                    , { field: '鏁版嵁鐘舵��', title: '鏁版嵁鐘舵��' }
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                    //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                    //, { field: '婧愬崟ID', title: '婧愬崟ID' }
+                    //, { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D' }
+                    //, { field: '瀛愭簮鍗曠被鍨�', title: '瀛愭簮鍗曠被鍨�' }
+                    , { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О' }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                    , { field: 'JIT鐗╂枡鍒嗙被', title: 'JIT鐗╂枡鍒嗙被' }
+                    , { field: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', title: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�' }
+                    , { field: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', title: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�' }
+                    , { field: 'JIT鎻愯揣鎵归噺', title: 'JIT鎻愯揣鎵归噺' }
+                    , { field: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡' }
+                    , { field: 'JIT渚涜揣鎻愬墠鏈�', title: 'JIT渚涜揣鎻愬墠鏈�' }
+                    , { field: 'JIT鍒拌揣鍓嶇疆鏈�', title: 'JIT鍒拌揣鍓嶇疆鏈�' }
+                    , { field: 'JIT閫佽揣鏂瑰紡', title: 'JIT閫佽揣鏂瑰紡' }
+                    , { field: 'JIT閫佽揣鎺у埗澶╂暟', title: 'JIT閫佽揣鎺у埗澶╂暟' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/NeedMaterPlanConfigBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var HWorkShopIDName = $("#HWorkShopIDName").val();//杞﹂棿
+            var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+            var HMaterModel = $("#HMaterModel").val();//瑙勬牸鍨嬪彿
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%' ";
+            }
+            if (HWorkShopIDName) {
+                sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "' ";
+            }
+            if (HMaterName) {
+                sWhere += " and 鐗╂枡鍚嶇О = '" + HMaterName + "' ";
+            }
+            if (HMaterNumber) {
+                sWhere += " and 鐗╂枡浠g爜 = '" + HMaterNumber + "' ";
+            }
+            if (HMaterModel) {
+                sWhere += " and 瑙勬牸鍨嬪彿 = '" + HMaterModel + "' ";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HBillNo").val("");
+            $("#HWorkShopID").val("");
+            $("#HWorkShopIDName").val("");
+            $("#HMaterID").val("");
+            $("#HMaterName").val("");
+            $("#HMaterNumber").val("");
+            $("#HMaterModel").val("");
+            sWhere = "";
+        }
+        //#endregion
+
+        //杞﹂棿鍒楄〃
+        function btnHHWorkShopID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鐗╂枡鍒楄〃
+        function btnHMaterID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+                    $("#HMaterModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/DelNeedMaterPlanConfigBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '瑕佹枡璁″垝淇℃伅鍒楄〃-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+        //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '瑕佹枡璁″垝淇℃伅鍒楄〃-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
new file mode 100644
index 0000000..6d6dfee
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
@@ -0,0 +1,490 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>瑕佹枡璁″垝淇℃伅鏂板</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HMaterID": "","HMaterNumber":"", "HMaterName": "", "HMaterModel": ""
+                , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
+                , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+            }];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍔犺浇缁勭粐
+            get_Organ();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4611' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 'full-170'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
+                    , { field: 'HWorkShopNumber', title: '杞﹂棿', edit: 'text', event: "HWorkShopID" }
+                    , { field: 'HWorkShopName', title: '杞﹂棿鍚嶇О' }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡', edit: 'text', event: "HMaterID" }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿'}
+                    , { field: 'HJITMaterGroup', title: 'JIT鐗╂枡鍒嗙被', edit: 'text' }
+                    , { field: 'HJITSafeStock', title: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', edit: 'text', width: 200 }
+                    , { field: 'HJITMaterDemand', title: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', edit: 'text', width:200}
+                    , { field: 'HJITBatchQty', title: 'JIT鎻愯揣鎵归噺', edit: 'text' }
+                    , { field: 'HDeliveryPeriod', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', edit: 'text', width: 200}
+                    , { field: 'HLeadTime', title: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', edit: 'text', width: 200 }
+                    , { field: 'HLeadTime_Sec', title: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', edit: 'text', width: 200}
+                    , { field: 'HDeliveryMode', title: 'JIT閫佽揣鏂瑰紡', edit: 'text' }
+                    , { field: 'HDeliveryDaysCtrl', title: 'JIT閫佽揣鎺у埗澶╂暟', edit: 'text', width: 200 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HMaterID": "","HMaterNumber":"", "HMaterName": "", "HMaterModel": ""
+                    , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
+                    , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+
+                        form.render('select');
+                        form.render('checkbox');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            form.render('select');
+                            form.render('checkbox');
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_AddNew(data);
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //缁勭粐閫夋嫨椤甸潰
+            function get_Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPRDORGID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽揩鎹烽敭
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //杞﹂棿
+                        if (obj.event == "HWorkShopID") {
+                            //鎵撳紑杞﹂棿灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "杞﹂棿鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HWorkShopID": checkStatus.data[0].HItemID
+                                        ,"HWorkShopNumber": checkStatus.data[0].HNumber
+                                        , "HWorkShopName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            //鎵撳紑鐗╂枡  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterNumber": checkStatus.data[0].HNumber
+                                        , "HMaterName": checkStatus.data[0].HName
+                                        , "HMaterModel": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/NeedMaterPlanConfigBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HPRDORGID": d.data[0].缁勭粐
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿缂栫爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠g爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
+                            , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+                            , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/AddNeedMaterPlanConfigBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 88ec8a8..d3ea933 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -67,9 +67,15 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                        <label class="layui-form-label">鐢熶骇杞﹂棿</label>
                                         <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+                                            <input type="text" class="layui-input" name="HDeptName" id="HDeptName">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                         </div>
                                     </div>
                                 </div>
@@ -189,19 +195,29 @@
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
                         , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
+                        
                         , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+                        , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
-                        , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 105 }
-                        , { field: 'HDeptID', title: 'HDeptID', hide: true}
+                        , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120 }
+                        , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 120 }
+                        , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 120 }
+                        , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 120 }
+                        , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 120 }
+                        , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 120 }
+                        , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120 }
+
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
                         , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
                         , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
-                        , { field: 'HMaterID', title: 'HMaterID' , hide: true}
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
                         , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 160 }
                         , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
-                        , { field: 'hunitid', title: 'hunitid' , hide: true}
+                        , { field: 'hunitid', title: 'hunitid', hide: true }
                         , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 115 }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        
                         , { field: 'hempid', title: 'hempid' , hide: true}
                         , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100 }
                         , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
@@ -280,6 +296,8 @@
                 var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
                 var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
                 var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+                var HDeptName = $("#HDeptName").val();//鍗曟嵁鍙�
+                var HMaterName = $("#HMaterName").val();//鍗曟嵁鍙�
                 if (HDate) {
                     sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
                 }
@@ -292,6 +310,12 @@
                 if (WorkCenter) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
                 }
+                if (HDeptName) {
+                    sWhere += " and 鐢熶骇杞﹂棿 like '%" + HDeptName + "%'";
+                }
+                if (HMaterName) {
+                    sWhere += " and 浜у搧浠g爜 like '%" + HMaterName + "%'";
+                }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
@@ -303,6 +327,8 @@
                 $("#HDate1").val("");//缁撴潫鏃ユ湡
                 $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
                 $("#WorkCenter").val("");//鍗曟嵁鍙�
+                $("#HDeptName").val("");//鍗曟嵁鍙�
+                $("#HMaterName").val("");//鍗曟嵁鍙�
                 $("#btnSearch").click();
                 sWhere = "";
             }
@@ -458,7 +484,7 @@
                 var PrintIds = "";
                 if (checkStatus.data.length >= 1) {
                     for (var i = 0; i < data.length; i++) {
-                        PrintIds += data[i].hmainid + "0" + data[i].HEntryID + ","
+                        PrintIds += data[i].hmainid + "-" + data[i].HEntryID + ","
                     }
                     PrintIds = PrintIds.substring(0, PrintIds.length - 1);
                     layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
new file mode 100644
index 0000000..a479d5e
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -0,0 +1,1397 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏃ヨ鍒掑伐鍗曟柊澧�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px; padding-left: 5%;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎵撳嵃娆℃暟</label>
+                                            <div class="layui-input-block" style="margin-left: 115px;">
+                                                <input type="text" class="layui-input" lay-verify="HPrintQty" name="HPrintQty" id="HPrintQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁″垝閮ㄩ棬</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HDeptIDName" name="HDeptIDName" id="HDeptIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁惧鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HSourceQty" name="HSourceQty" id="HSourceQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏ュ簱鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 115px;">
+                                                <input type="text" class="layui-input" lay-verify="HInStockQty" name="HInStockQty" id="HInStockQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HMaterIDNumber" name="HMaterIDNumber" id="HMaterIDNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" readonly style="background-color:#efefef4d;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" readonly style="background-color:#efefef4d;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐝粍</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HGroupID" name="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HGroupIDName" name="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroupID" id="btnHGroupID" style="padding: 0 10px;float: right;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏宠仈鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HRelationQty" name="HRelationQty" id="HRelationQty">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曚綅</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HUnitID" name="HUnitID" id="HUnitID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HUnitIDName" name="HUnitIDName" id="HUnitIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitID" id="btnHUnitID" style="padding: 0 10px;float: right;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎿嶄綔宸�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HWorkerID" name="HWorkerID" id="HWorkerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HWorkerIDName" name="HWorkerIDName" id="HWorkerIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkerID" id="btnHWorkerID" style="padding: 0 10px;float: right;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HSourceIDName" name="HSourceIDName" id="HSourceIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID" style="padding: 0 10px;float: right;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">宸ュ崟鐢熶骇鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 78px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">寮�宸ュ伐鏃�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HBeginWorkTimes" name="HBeginWorkTimes" id="HBeginWorkTimes">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏ュ簱璐т富绫诲瀷</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HInStockOwnerTypeID" id="HInStockOwnerTypeID" lay-verify="HInStockOwnerTypeID">
+                                                    <option value="涓氬姟缁勭粐">涓氬姟缁勭粐</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ眹鎶ユ暟閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HSplitRelationQty" name="HSplitRelationQty" id="HSplitRelationQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟绛夌骇</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HOrderLev" id="HOrderLev" lay-verify="HOrderLev">
+                                                    <option value="鏅��">鏅��</option>
+                                                    <option value="绱ф��">绱ф��</option>
+                                                    <option value="鐗规��">鐗规��</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">灏忔椂浜ц兘</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HWorkQty" name="HWorkQty" id="HWorkQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ヨ鍒掓暟閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HSplitPlanQty" name="HSplitPlanQty" id="HSplitPlanQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璐т富绫诲瀷</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HOwnerTypeID" id="HOwnerTypeID" lay-verify="HOwnerTypeID">
+                                                    <option value="涓氬姟缁勭粐">涓氬姟缁勭粐</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁″垝寮�濮嬫棩鏈�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 78px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁″垝缁撴潫鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 78px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璐т富缂栫爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HOwnerID" id="HOwnerID" lay-verify="HOwnerID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎵规</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HBatchNo" name="HBatchNo" id="HBatchNo">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浼樺厛绾�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HYX" name="HYX" id="HYX">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇鍛ㄦ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HProdTimes" name="HProdTimes" id="HProdTimes">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">濮旀墭缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HEntrustORGID" id="HEntrustORGID" lay-verify="HEntrustORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁″垝鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HPlanQty" name="HPlanQty" id="HPlanQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缂栧埗鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HPreparatDate" name="HPreparatDate" id="HPreparatDate" style="padding-left: 78px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟闇�姹傛暟閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HOrderNeedQty" name="HOrderNeedQty" id="HOrderNeedQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟浜よ揣鏈�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HOrderCommitDate" name="HOrderCommitDate" id="HOrderCommitDate" style="padding-left: 78px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">榻愬鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HCompleteQty" name="HCompleteQty" id="HCompleteQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">閿�鍞鍗曟暟閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HSeOrderBillQty" name="HSeOrderBillQty" id="HSeOrderBillQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍐呯爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HICMOInterID" name="HICMOInterID" id="HICMOInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎻愬墠鏈�(澶�)</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HKTQ" name="HKTQ" id="HKTQ">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏ュ簱缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HStockInORGID" id="HStockInORGID" lay-verify="HStockInORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ヨ鍒掓暟閲忔�婚噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HDayPlanSumQty" name="HDayPlanSumQty" id="HDayPlanSumQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">婧愬崟缂栧彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HSourceBillNo" name="HSourceBillNo" id="HSourceBillNo">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鏄庣粏鍐呯爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HICMOEntryID" name="HICMOEntryID" id="HICMOEntryID">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀵煎叆(鎺掍骇)ID</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMainInterID" name="HMainInterID" id="HMainInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏈帓鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HLeftPlanQty" name="HLeftPlanQty" id="HLeftPlanQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍛樺伐</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HEmpIDName" name="HEmpIDName" id="HEmpIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏ュ簱璐т富缂栫爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HInStockOwnerID" id="HInStockOwnerID" lay-verify="HInStockOwnerID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鏄庣粏琛屽彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HICMOEntrySEQ" name="HICMOEntrySEQ" id="HICMOEntrySEQ">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍗曟嵁绫诲瀷</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HICMOBillType" name="HICMOBillType" id="HICMOBillType">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HCloseCount" name="HCloseCount" id="HCloseCount">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟绫诲瀷</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
+                                                    <option value="鐢熶骇璁㈠崟">鐢熶骇璁㈠崟</option>
+                                                    <option value="濮斿璁㈠崟">濮斿璁㈠崟</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎷嗗崟鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HSplitQty" name="HSplitQty" id="HSplitQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浜х嚎鍏ュ簱鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HSourceStockInQty" name="HSourceStockInQty" id="HSourceStockInQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浼樺厛绾�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HPriority" name="HPriority" id="HPriority">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 70px;">
+                                                <input type="checkbox" name="checkboxHLocked" id="checkboxHLocked" lay-skin="primary" lay-filter="checkboxHLocked" title="閿佸畾鏍囪">
+                                                <input type="hidden" value="false" name="HLocked" id="HLocked" lay-verify="HLocked">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 70px;">
+                                                <input type="checkbox" name="checkboxHHangUp" id="checkboxHHangUp" lay-skin="primary" lay-filter="checkboxHHangUp" title="鎸傝捣鏍囪">
+                                                <input type="hidden" value="false" name="HHangUp" id="HHangUp" lay-verify="HHangUp">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+
+
+
+        </div>
+    </div>
+
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <!--澶嶉�夋 閿佸畾鏍囪-->
+    <script type="text/html" id="HLockedSub">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HLockedSub" lay-filter="HLockedSub" id="HLockedSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+
+    <!--澶嶉�夋 鐘舵�佹爣璁�-->
+    <script type="text/html" id="HStatusTag">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HStatusTag" lay-filter="HStatusTag" id="HStatusTag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+
+    <!--澶嶉�夋 鎵嬪伐淇敼鏍囪-->
+    <script type="text/html" id="HIsHandModify">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HIsHandModify" lay-filter="HIsHandModify" id="HIsHandModify{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+
+    <!--澶嶉�夋 鏄惁鎵嬪伐鍏抽棴-->
+    <script type="text/html" id="HCloseTypeSub">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HCloseTypeSub" lay-filter="HCloseTypeSub" id="HCloseTypeSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == -1) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4610' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var rowdata = [{
+                "HMasterDate": "", "HQty": "", "HRptFinishQty": "", "HTimes": "", "HUseTimes": "", "HBTimes": "", "HETimes": "",
+                "HRemark": "", "HDateSub": "", "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": false, "HColumn": "", "HLockedSub": false, "HComplete": "",
+                "HStatusTag": false, "HIsHandModify": false
+            }];
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 400
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HMasterDate', title: '鏃ヨ鍒掔敓浜ф棩鏈�', event: "HMasterDate"  }//datetime
+                    , { field: 'HQty', title: '鏃ヨ鍒掓暟閲�', edit: 'text' }
+                    , { field: 'HRptFinishQty', title: '姹囨姤瀹屾垚鏁伴噺', edit: 'text' }
+                    //棰勭暀鏁伴噺
+                    , { field: 'HTimes', title: ' 鍓╀綑宸ユ椂', edit: 'text' }
+                    , { field: 'HUseTimes', title: '鍗犵敤宸ユ椂', edit: 'text' }
+                    , { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes"  }//datetime
+                    , { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes"}//datetime
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { field: 'HDateSub', title: '鎺掍骇鏃ユ湡', event: "HDateSub" }//datetime
+                    , { field: 'HCloseMan', title: '琛屽叧闂�', edit: 'text' }
+                    , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', event: "HEntryCloseDate" }//datetime
+                    , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: '#HCloseTypeSub' }//check
+                    , { field: 'HColumn', title: 'Excel鍒楀ご', edit: 'text' }
+                    , { field: 'HLockedSub', title: '閿佸畾鏍囪', templet: '#HLockedSub' }//check
+                    , { field: 'HComplete', title: '鏄惁榻愬', edit: 'text' }
+                    , { field: 'HStatusTag', title: '鐘舵�佹爣璁�', templet: '#HStatusTag' }//check
+                    , { field: 'HIsHandModify', title: '鎵嬪伐淇敼鏍囪', templet: '#HIsHandModify' }//check
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 涓�
+
+            //閫夋嫨璁″垝閮ㄩ棬鎸夐挳
+            form.on('submit(btnHDeptID)', function () {
+                get_btnHDeptID(1);
+            });
+
+            //閫夋嫨鐢熶骇杞﹂棿鎸夐挳
+            form.on('submit(btnHWorkShopID)', function () {
+                get_btnHDeptID(2);
+            });
+
+            //閫夋嫨鐗╂枡鎸夐挳
+            form.on('submit(btnHMaterID)', function () {
+                get_btnHMaterID();
+            });
+
+            //閫夋嫨鐝粍鎸夐挳
+            form.on('submit(btnHGroupID)', function () {
+                get_btnHGroupID();
+            });
+
+            //閫夋嫨鍗曚綅鎸夐挳
+            form.on('submit(btnHUnitID)', function () {
+                get_btnHUnitID();
+            });
+
+            //閫夋嫨鎿嶄綔宸ユ寜閽�
+            form.on('submit(btnHWorkerID)', function () {
+                get_btnHWorkerID(1);
+            });
+
+            //閫夋嫨鍛樺伐鎸夐挳
+            form.on('submit(btnHEmpID)', function () {
+                get_btnHWorkerID(2);
+            });
+
+            //閫夋嫨鐢熶骇璧勬簮鎸夐挳
+            form.on('submit(btnHSourceID)', function () {
+                get_btnHSourceID();
+            });
+
+            //閿佸畾鏍囪
+            form.on('checkbox(checkboxHLocked)', function (data) {
+                $("#HLocked").val(data.elem.checked);
+            });
+
+            //鎸傝捣鏍囪
+            form.on('checkbox(checkboxHHangUp)', function (data) {
+                $("#HHangUp").val(data.elem.checked);
+            });
+
+            //#endregion
+
+            //#region 瀛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMasterDate": "", "HQty": "", "HRptFinishQty": "", "HTimes": "", "HUseTimes": "", "HBTimes": "", "HETimes": "",
+                    "HRemark": "", "HDateSub": "", "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": false, "HColumn": "", "HLockedSub": false, "HComplete": "",
+                    "HStatusTag": false, "HIsHandModify": false
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                          //鍒锋柊澶嶉�夋
+                        checkRefresh();
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+
+                //#region 淇敼琛� 鏃堕棿
+
+                var data = obj.data;
+                //鏃ヨ鍒掔敓浜ф棩鏈�
+                if (obj.event == 'HMasterDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //寮�濮嬫椂闂�
+                if (obj.event == 'HBTimes') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //缁撴潫鏃堕棿
+                if (obj.event == 'HETimes') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+                
+                //鎺掍骇鏃ユ湡
+                if (obj.event == 'HDateSub') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //琛屽叧闂棩鏈�
+                if (obj.event == 'HEntryCloseDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //#endregion
+
+            });
+
+            //#region 澶嶉�夋
+            //閿佸畾鏍囪
+            form.on('checkbox(HLockedSub)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HLockedSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //鐘舵�佹爣璁�
+            form.on('checkbox(HStatusTag)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStatusTag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //鎵嬪伐淇敼鏍囪
+            form.on('checkbox(HIsHandModify)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HIsHandModify = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //鏄惁鎵嬪伐鍏抽棴
+            form.on('checkbox(HCloseTypeSub)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HCloseTypeSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //#endregion
+
+            //#endregion
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linterid == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData()) {
+                    set_AddNew(data);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍔犺浇缁勭粐
+                Organ();
+                //鍒跺崟浜�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), 'yyyy-MM-dd'));
+                $("#HPlanBeginDate").val(Format(new Date(), 'yyyy-MM-dd'));
+                $("#HPlanEndDate").val(Format(new Date(), 'yyyy-MM-dd'));
+                $("#HPreparatDate").val(Format(new Date(), 'yyyy-MM-dd'));
+                $("#HOrderCommitDate").val(Format(new Date(), 'yyyy-MM-dd'));
+            }
+
+            //#region 涓�
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '<option  style="color:blue;" value="0">缁勭粐</option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HEntrustORGID").append(Organization);
+                            $("#HOwnerID").append(Organization);
+                            $("#HStockInORGID").append(Organization);
+                            $("#HProdORGID").append(Organization);
+                            $("#HInStockOwnerID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //閮ㄩ棬
+            function get_btnHDeptID(DeptIDindex) {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        switch (DeptIDindex) {
+                            case 1:
+                                //鑾峰彇鏁版嵁
+                                $("#HDeptID").val(checkStatus.data[0].HItemID);//璁″垝閮ㄩ棬id
+                                $("#HDeptIDName").val(checkStatus.data[0].HName);//璁″垝閮ㄩ棬鍚嶇О
+                                break;
+                            case 2:
+                                //鑾峰彇鏁版嵁
+                                $("#HWorkShopID").val(checkStatus.data[0].HItemID);//鐢熶骇杞﹂棿id
+                                $("#HWorkShopIDName").val(checkStatus.data[0].HName);//鐢熶骇杞﹂棿鍚嶇О
+                                break;
+                        }
+
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //鐗╂枡
+            function get_btnHMaterID() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐗╂枡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        $("#HMaterName").val(checkStatus.data[0].HName);
+                        $("#HMaterIDNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterModel").val(checkStatus.data[0].HModel);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //鐝粍
+            function get_btnHGroupID() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        $("#HGroupIDName").val(checkStatus.data[0].鐝粍鍚嶇О);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //鍗曚綅
+            function get_btnHUnitID() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鍗曚綅鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HUnitID").val(checkStatus.data[0].HItemID);
+                        $("#HUnitIDName").val(checkStatus.data[0].HName);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //鎿嶄綔宸�
+            function get_btnHWorkerID(EmployeeIndex) {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        switch (EmployeeIndex) {
+                            case 1:
+                                //鑾峰彇鏁版嵁
+                                $("#HWorkerID").val(checkStatus.data[0].HItemID);
+                                $("#HWorkerIDName").val(checkStatus.data[0].HName);
+                                break;
+                            case 2:
+                                //鑾峰彇鏁版嵁
+                                $("#HEmpID").val(checkStatus.data[0].HItemID);
+                                $("#HEmpIDName").val(checkStatus.data[0].HName);
+                                break;
+                        }
+
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //鐢熶骇璧勬簮
+            function get_btnHSourceID() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '璧勬簮鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        $("#HSourceIDName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //#endregion
+
+            //澶氶��  鍒锋柊琛ㄦ牸
+            function checkRefresh() {
+                for (var i = 1; i <= option.data.length; i++) {
+
+                    //閿佸畾鏍囪
+                    if (option.data[i - 1].HLockedSub) {
+                        $('#HLockedSub' + i + '').attr("checked", true);
+                    }
+                    //鐘舵�佹爣璁�
+                    if (option.data[i - 1].HStatusTag) {
+                        $('#HStatusTag' + i + '').attr("checked", true);
+                    }
+                    //鎵嬪伐淇敼鏍囪
+                    if (option.data[i - 1].HIsHandModify) {
+                        $('#HIsHandModify' + i + '').attr("checked", true);
+                    }
+
+                    //鏄惁鎵嬪伐鍏抽棴
+                    if (option.data[i - 1].HCloseTypeSub) {
+                        $('#HCloseTypeSub' + i + '').attr("checked", true);
+                    }
+                }
+                form.render('select');
+                form.render('checkbox');
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //淇濆瓨
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        //鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
+                        if (table.cache["mainTable"][i].HEntryCloseDate == "") {
+                            table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01 00:00:00.000"
+                        }
+
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_WorkBillSortBill/AddWorkBillSortBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+                      
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HPrintQty": d.data[0].鎵撳嵃娆℃暟
+                            , "HDeptID": d.data[0].HDeptID
+                            , "HDeptIDName": d.data[0].閮ㄩ棬鍚嶇О
+                            , "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿
+                            , "HSourceQty": d.data[0].璁惧鏁伴噺
+                            , "HInStockQty": d.data[0].鍏ュ簱鏁伴噺
+                            , "HMaterID": d.data[0].HMaterID
+                            , "HMaterIDNumber": d.data[0].鐗╂枡浠g爜
+                            , "HMaterName": d.data[0].鐗╂枡鍚嶇О
+                            , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
+                            , "HGroupID": d.data[0].HGroupID
+                            , "HGroupIDName": d.data[0].鐝粍
+                            , "HWorkShopID": d.data[0].HWorkShopID
+                            , "HWorkShopIDName": d.data[0].鐢熶骇杞﹂棿
+                            , "HRelationQty": d.data[0].鍏宠仈鏁伴噺
+                            , "HUnitID": d.data[0].HUnitID
+                            , "HUnitIDName": d.data[0].璁¢噺鍗曚綅
+                            , "HWorkerID": d.data[0].HWorkerID
+                            , "HWorkerIDName": d.data[0].鎿嶄綔宸�
+                            , "HSourceID": d.data[0].HSourceID
+                            , "HSourceIDName": d.data[0].鐢熶骇璧勬簮
+                            , "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+                            , "HBeginWorkTimes": d.data[0].寮�宸ュ伐鏃�
+                            , "HInStockOwnerTypeID": d.data[0].鍏ュ簱璐т富绫诲瀷
+                            , "HSplitRelationQty": d.data[0].鏃ユ眹鎶ユ暟閲�
+                            , "HOrderLev": d.data[0].璁㈠崟绛夌骇
+                            , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            , "HWorkQty": d.data[0].灏忔椂浜ц兘
+                            , "HSplitPlanQty": d.data[0].涓绘棩璁″垝鏁伴噺
+                            , "HOwnerTypeID": d.data[0].璐т富绫诲瀷
+                            , "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�濮嬫棩鏈�), "yyyy-MM-dd")
+                            , "HPlanEndDate":Format(new Date(d.data[0].璁″垝缁撴潫鏃ユ湡), "yyyy-MM-dd")
+                            , "HICMOBillNo": d.data[0].鐢熶骇璁㈠崟鍙�
+                            , "HOwnerID": d.data[0].璐т富缂栫爜
+                            , "HBatchNo": d.data[0].鎵规
+                            , "HYX": d.data[0].浼樺厛绾�
+                            , "HProdTimes": d.data[0].鐢熶骇鍛ㄦ湡
+                            , "HEntrustORGID": d.data[0].濮旀墭缁勭粐
+                            , "HPlanQty": d.data[0].璁″垝鏁伴噺
+                            , "HPreparatDate":Format(new Date(d.data[0].缂栧埗鏃ユ湡), "yyyy-MM-dd")
+                            , "HOrderNeedQty": d.data[0].璁㈠崟闇�姹傛暟閲�
+                            , "HOrderCommitDate": Format(new Date(d.data[0].璁㈠崟浜よ揣鏈�), "yyyy-MM-dd")
+                            , "HCompleteQty": d.data[0].榻愬鏁伴噺
+                            , "HSeOrderBillQty": d.data[0].閿�鍞鍗曟暟閲�
+                            , "HICMOInterID": d.data[0].鐢熶骇璁㈠崟鍐呯爜
+                            , "HKTQ": d.data[0].鎻愬墠鏈�
+                            , "HStockInORGID": d.data[0].鍏ュ簱缁勭粐
+                            , "HDayPlanSumQty": d.data[0].鏃ヨ鍒掓暟閲忔�婚噺
+                            , "HSourceBillNo": d.data[0].婧愬崟缂栧彿
+                            , "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟鏄庣粏鍐呯爜
+                            , "HMainInterID": d.data[0].瀵煎叆鎺掍骇ID
+                            , "HProdORGID": d.data[0].鐢熶骇缁勭粐
+                            , "HLeftPlanQty": d.data[0].鏈帓鏁伴噺
+                            , "HEmpID": d.data[0].HEmpID
+                            , "HEmpIDName": d.data[0].鑱屽憳
+                            , "HInStockOwnerID": d.data[0].鍏ュ簱璐т富缂栫爜
+                            , "HICMOEntrySEQ": d.data[0].鐢熶骇璁㈠崟鏄庣粏琛屽彿
+                            , "HICMOBillType": d.data[0].鐢熶骇璁㈠崟鍗曟嵁绫诲瀷
+                            , "HCloseCount": d.data[0].鍏抽棴鏁伴噺
+                            , "HOrderType": d.data[0].璁㈠崟绫诲瀷
+                            , "HSplitQty": d.data[0].鎷嗗崟鏁伴噺
+                            , "HSourceStockInQty": d.data[0].浜х嚎鍏ュ簱鏁伴噺
+                            , "HPriority": d.data[0].HPriority
+                            , "HLocked": d.data[0].涓婚攣瀹氭爣璁� == "0" ? false : true
+                            , "HHangUp": d.data[0].鎸傝捣鏍囪 == "0" ? false : true
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HMasterDate": Format(new Date(d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
+                            , "HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[0].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[0].缁撴潫鏃堕棿), "yyyy-MM-dd")
+                            , "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[0].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate":Format(new Date(d.data[0].瀛愬叧闂椂闂�), "yyyy-MM-dd")
+                            , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": d.data[0].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[0].鏄惁榻愬
+                            , "HStatusTag": d.data[0].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[0].鎵嬪伐淇敼鏍囪 == 0 ? false : true
+                        }];
+
+                        option.data = rowdata;
+                        table.render(option);
+
+                        //涓婚攣瀹氭爣璁�
+                        if (d.data[0].涓婚攣瀹氭爣璁� == "1") {
+                            $("#checkboxHLocked").attr("checked", true);
+                        }
+                        //鎸傝捣鏍囪
+                        if (d.data[0].鎸傝捣鏍囪 == "1") {
+                            $("#checkboxHHangUp").attr("checked", true);
+                        }
+
+                        //鏄惁鎵嬪伐鍏抽棴
+                        if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
+                            $('#HCloseTypeSub1').attr("checked", true);
+                        }
+
+                        //閿佸畾鏍囪
+                        if (d.data[0].瀛愰攣瀹氭爣璁� == "1") {
+                            $('#HLockedSub1').attr("checked", true);
+                        }
+
+                         //鐘舵�佹爣璁�
+                        if (d.data[0].鐘舵�佹爣璁� == "1") {
+                            $('#HStatusTag1').attr("checked", true);
+                        }
+
+                        //鎵嬪伐淇敼鏍囪
+                        if (d.data[0].鎵嬪伐淇敼鏍囪 == "1") {
+                            $('#HIsHandModify1').attr("checked", true);
+                        }
+                        form.render('checkbox');
+                    }
+                })
+            }
+
+            //闈炵┖楠岃瘉
+            function AllowLoadData() {
+               
+                //鐢熶骇杞﹂棿
+                if ($("#HWorkShopID").val() == "0") {
+                    layer.msg("鐢熶骇杞﹂棿娌℃湁閫夋嫨");
+                    return false;
+                }
+
+                //鐢熶骇璧勬簮
+                if ($("#HSourceID").val() == "0") {
+                    layer.msg("鐢熶骇璧勬簮娌℃湁閫夋嫨");
+                    return false;
+                }
+
+                //鐢熶骇缁勭粐
+                if ($("#HProdORGID").val() == "0") {
+                    layer.msg("鐢熶骇缁勭粐娌℃湁閫夋嫨");
+                    return false;
+                }
+                return true;
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //#endregion
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
new file mode 100644
index 0000000..89dc3c5
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -0,0 +1,442 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏃ヨ鍒掑伐鍗曞垪琛�</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-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" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="Organization" id="Organization" lay-verify="Organization">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <!--鍏朵粬鏉′欢-->
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+                //鍏抽棴
+                case 'set_CloseBill': set_CloseBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 鐢熶骇杞﹂棿
+        form.on('submit(btnHWorkShopID)', function (data) {
+            btnHWorkShopID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鐢熶骇缁勭粐鍔犺浇
+            Organ();
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', hide: true }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
+                    , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                    , { 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: '鍏抽棴鏁伴噺' }
+                    , { 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: '浣滃簾鏃ユ湡' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#Organization").append(Organization);
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_WorkBillSortBill/Sc_WorkBillSortBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var Organization = $("#Organization").val();//閲囪喘缁勭粐
+            var HWorkShopIDName = $("#HWorkShopIDName").val();//鐢熶骇杞﹂棿
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (Organization) {
+                sWhere += " and 鐢熶骇缁勭粐 = '" + Organization + "'";
+            }
+            if (HWorkShopIDName) {
+                sWhere += " and 鐢熶骇杞﹂棿 = '" + HWorkShopIDName + "'";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HBillNo").val("");
+            $("#Organization").val("");//閲囪喘缁勭粐
+            $("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
+            $("#HWorkShopID").val("");//鐢熶骇杞﹂棿
+            sWhere = "";
+        }
+        //#endregion
+
+        //鐢熶骇杞﹂棿鍒楄〃
+        function btnHWorkShopID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_WorkBillSortBill/DelWorkBillSortBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //鍏抽棴
+        function set_CloseBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_WorkBillSortBill/CloseWorkBillSortBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '鏃ヨ鍒掑伐鍗曞垪琛�-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+            //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏃ヨ鍒掑伐鍗曞垪琛�-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
new file mode 100644
index 0000000..92e5ee6
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -0,0 +1,969 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>瑕佹枡璁″垝鍗曟柊澧�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浜よ揣鍦扮偣</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HAddress" name="HAddress" id="HAddress">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HDeptIDName" name="HDeptIDName" id="HDeptIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁撶畻甯佸埆</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HSettleCurrId" name="HSettleCurrId" id="HSettleCurrId" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HSettleCurrIdName" name="HSettleCurrIdName" id="HSettleCurrIdName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSettleCurrId" id="btnHSettleCurrId" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瑕佹枡鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎽樿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HExplanation" name="HExplanation" id="HExplanation">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(寤惰繜鍘熷洜)-->
+    <script type="text/html" id="HLaterReason">
+        <select name="HLaterReason" lay-filter="HLaterReason" id="HLaterReason{{d.LAY_TABLE_INDEX+1}}">
+            <option value=""></option>
+            <option value="璁捐鍙樻洿鍥犵礌褰卞搷">璁捐鍙樻洿鍥犵礌褰卞搷</option>
+            <option value="妯″叿璁惧褰卞搷">妯″叿璁惧褰卞搷</option>
+            <option value="蹇�掔墿娴佸奖鍝�">蹇�掔墿娴佸奖鍝�</option>
+            <option value="浜у搧璐ㄩ噺闂">浜у搧璐ㄩ噺闂</option>
+            <option value="鍘熸枡澶囪揣寤舵湡">鍘熸枡澶囪揣寤舵湡</option>
+            <option value="浜哄憳浜ц兘涓嶈冻">浜哄憳浜ц兘涓嶈冻</option>
+            <option value="涓嶅彲鎶楀姏鍥犵礌">涓嶅彲鎶楀姏鍥犵礌</option>
+        </select>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(鐗╂枡灞炴��)-->
+    <script type="text/html" id="HErpClsID">
+        <select name="HErpClsID" lay-filter="HErpClsID" id="HErpClsID{{d.LAY_TABLE_INDEX+1}}">
+            <option value=""></option>
+            <option value="澶栬喘">澶栬喘</option>
+            <option value="鑷埗">鑷埗</option>
+            <option value="濮斿">濮斿</option>
+            <option value="閰嶇疆">閰嶇疆</option>
+            <option value="璧勪骇">璧勪骇</option>
+            <option value="鐗瑰緛">鐗瑰緛</option>
+            <option value="璐圭敤">璐圭敤</option>
+            <option value="铏氭嫙">铏氭嫙</option>
+            <option value="鏈嶅姟">鏈嶅姟</option>
+            <option value="涓�娆℃��">涓�娆℃��</option>
+            <option value="妯″瀷">妯″瀷</option>
+            <option value="浜у搧绯诲垪">浜у搧绯诲垪</option>
+            <option value="鍏朵粬">鍏朵粬</option>
+        </select>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(鐘舵��)-->
+    <script type="text/html" id="HStatus">
+        <select name="HStatus" lay-filter="HStatus" id="HStatus{{d.LAY_TABLE_INDEX+1}}">
+            <option value=""></option>
+            <option value="纭">纭</option>
+            <option value="鏈‘璁�">鏈‘璁�</option>
+        </select>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(閲囪喘缁勭粐)-->
+    <script type="text/html" id="HProdORGIDSub">
+        <select name="HProdORGIDSub" lay-filter="HProdORGIDSub" id="HProdORGIDSub{{d.LAY_TABLE_INDEX+1}}">
+            <option value=""></option>
+            <option value="1">钃濇捣瀹炰笟闆嗗洟</option>
+            <option value="100035">钃濇捣閫氳鍏徃</option>
+            <option value="100037">閫氳鍏徃鏈儴</option>
+            <option value="100038">鎵嬫満浜嬩笟閮�</option>
+            <option value="100039">骞虫澘浜嬩笟閮�</option>
+            <option value="100040">钃濇捣鐢靛瓙鍏徃</option>
+            <option value="100041">钃濇捣閿�鍞叕鍙�</option>
+            <option value="100042">棣欐腐閿�鍞叕鍙�</option>
+            <option value="100043">钃濇捣鐢靛瓙鍟嗗姟鏈夐檺鍏徃</option>
+            <option value="100044">钃濇捣闆跺敭杩為攣鍏徃</option>
+            <option value="100045">骞垮窞闂ㄥ簵</option>
+            <option value="100046">娣卞湷闂ㄥ簵</option>
+            <option value="100047">鏉窞鍗庡畯閫氫俊璁惧鏈夐檺鍏徃</option>
+        </select>
+    </script>
+
+    <!--澶嶉�夋 鍏抽棴鐘舵��-->
+    <script type="text/html" id="HCloseStatus">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HCloseStatus" lay-filter="HCloseStatus" id="HCloseStatus{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+
+    <!--澶嶉�夋 鏄惁鎵嬪伐鍏抽棴-->
+    <script type="text/html" id="HCloseTypeSub">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HCloseTypeSub" lay-filter="HCloseTypeSub" id="HCloseTypeSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                ,excel = layui.excel
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+                , "HErpClsID": "", "HQty": "", "HRemark": "", "HProdORGID": "", "HStatus": "", "HFixleadTime": ""
+                , "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": ""
+                , "HDayPlanDate": "", "HRelationQty": 0, "HICMOInterID": "", "HICMOEntryID": "", "HICMOBillSEQ": ""
+                , "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": false, "HReciveQty": "", "HCloseStatus": false
+                , "HRemoveQty": "", "HSeOrderBillNo": "", "HICMOEmpID": "", "HICMOEmpIDName": "", "HUnReciveQty": "", "HICMOBillDate": ""
+                , "HICMOBillDeliveryDate": "", "HICMOBillRemark": "", "HICMOBillNote": ""
+            }];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍔犺浇缁勭粐
+            get_Organ();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == -1) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4609' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 'full-270'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HLaterReason', title: '寤惰繜鍘熷洜', templet: '#HLaterReason', width: 200 }//list
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                    , { field: 'HUnitIDName', title: '璁¢噺鍗曚綅', edit: 'text', event: "HUnitID" }
+                    , { field: 'HErpClsID', title: '鐗╂枡灞炴��', templet: '#HErpClsID' }//list
+                    , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { field: 'HProdORGID', title: '鐢熶骇缁勭粐', templet: "#HProdORGIDSub" }
+                    , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }//list
+                    , { field: 'HFixleadTime', title: '鎻愬墠鏈�', edit: 'text' }
+                    , { field: 'HSourceInterID', title: '鏃ヨ鍒掑伐鍗旻ID', edit: 'text' }
+                    , { field: 'HSourceEntryID', title: '鏃ヨ鍒掑伐鍗旻ENTRYID', width: 200, edit: 'text' }
+                    , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text' }
+                    , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, event: 'HDayPlanDate' }//date
+                    , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text' }
+                    , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text' }
+                    , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text' }
+                    , { field: 'HICMOBillSEQ', title: '鐢熶骇璁㈠崟琛屽彿', edit: 'text' }
+                    , { field: 'HCloseMan', title: '琛屽叧闂�', width: 200, edit: 'text' }
+                    , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', width: 200, event: 'HEntryCloseDate' }//date
+                    , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: "#HCloseTypeSub" }//ck
+                    , { field: 'HReciveQty', title: '鍏ュ簱鏁伴噺', edit: 'text' }
+                    , { field: 'HCloseStatus', title: '鍏抽棴鐘舵��', templet: "#HCloseStatus" }//ck
+                    , { field: 'HRemoveQty', title: '杞Щ鏁伴噺', edit: 'text' }
+                    , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text' }
+                    , { field: 'HICMOEmpID', title: 'HICMOEmpID', hide: true }
+                    , { field: 'HICMOEmpIDName', title: '鐢熶骇璁㈠崟鍒跺崟浜�', edit: 'text', event: "HICMOEmpID" }
+                    , { field: 'HUnReciveQty', title: '鏈敹鏂欐暟閲�', edit: 'text' }
+                    , { field: 'HICMOBillDate', title: '鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡', event: "HICMOBillDate", width: 200 }//date
+                    , { field: 'HICMOBillDeliveryDate', title: '鐢熶骇璁㈠崟浜よ揣鏃ユ湡', event: "HICMOBillDeliveryDate", width: 200 } // date
+                    , { field: 'HICMOBillRemark', title: '鐢熶骇璁㈠崟鎽樿', edit: 'text' }
+                    , { field: 'HICMOBillNote', title: '鐢熶骇璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(btnHDeptID)', function () {
+                get_btnHDeptID();
+            });
+
+            //閫夋嫨甯佸埆鎸夐挳
+            form.on('submit(btnHSettleCurrId)', function () {
+                get_btnHSettleCurrId();
+            });
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+                    , "HErpClsID": "", "HQty": "", "HRemark": "", "HProdORGID": "", "HStatus": "", "HFixleadTime": ""
+                    , "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": ""
+                    , "HDayPlanDate": "", "HRelationQty": 0, "HICMOInterID": "", "HICMOEntryID": "", "HICMOBillSEQ": ""
+                    , "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": false, "HReciveQty": "", "HCloseStatus": false
+                    , "HRemoveQty": "", "HSeOrderBillNo": "", "HICMOEmpID": "", "HICMOEmpIDName": "", "HUnReciveQty": "", "HICMOBillDate": ""
+                    , "HICMOBillDeliveryDate": "", "HICMOBillRemark": "", "HICMOBillNote": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+
+                        //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+                        checkRefresh();
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                            //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+                            checkRefresh();
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                //#region 鏃堕棿鎺т欢 缁戝畾
+
+                var data = obj.data;
+                //鏃ヨ鍒掔敓浜ф棩鏈�
+                if (obj.event == 'HDayPlanDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //琛屽叧闂棩鏈�
+                if (obj.event == 'HEntryCloseDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡
+                if (obj.event == 'HICMOBillDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //鐢熶骇璁㈠崟浜よ揣鏃ユ湡
+                if (obj.event == 'HICMOBillDeliveryDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //#endregion
+
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linterid == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData()) {
+                    set_AddNew(data);
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                }
+            });
+
+            //琛岄�夋嫨澶勭悊锛堝欢杩熷師鍥狅級
+            form.on('select(HLaterReason)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HLaterReason = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //琛岄�夋嫨澶勭悊锛堢墿鏂欏睘鎬э級
+            form.on('select(HErpClsID)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HErpClsID = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+            form.on('select(HStatus)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //琛岄�夋嫨澶勭悊锛堥噰璐粍缁囷級
+            form.on('select(HProdORGIDSub)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HProdORGID = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //鍏抽棴鐘舵��
+            form.on('checkbox(HCloseStatus)', function (data) {
+                //鑾峰彇閫変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HCloseStatus = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //鏄惁鎵嬪伐鍏抽棴
+            form.on('checkbox(HCloseTypeSub)', function (data) {
+                //鑾峰彇閫変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HCloseTypeSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //缁勭粐閫夋嫨椤甸潰
+            function get_Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '<option  style="color:blue;" value="0">缁勭粐</option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HProdORGID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //澶氶��  鍒锋柊琛ㄦ牸
+            function checkRefresh() {
+                for (var i = 1; i <= option.data.length; i++) {
+                    console.log(JSON.stringify(option.data[i - 1]))
+                    //寤惰繜鍘熷洜
+                    $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
+                    //鐗╂枡灞炴��
+                    $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
+                    //鐘舵��
+                    $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+                    //閲囪喘缁勭粐
+                    $('#HProdORGIDSub' + i + '').find("option[value='" + option.data[i - 1].HProdORGID + "']").attr("selected", true);
+
+                    //鍏抽棴鐘舵��
+                    if (option.data[i - 1].HCloseStatus) {
+                        $('#HCloseStatus' + i + '').attr("checked", true);
+                    }
+
+                    //鏄惁鎵嬪伐鍏抽棴
+                    if (option.data[i - 1].HCloseTypeSub) {
+                        $('#HCloseTypeSub' + i + '').attr("checked", true);
+                    }
+                }
+                form.render('select');
+                form.render('checkbox');
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //閫夋嫨閮ㄩ棬
+            function get_btnHDeptID() {
+                //鎵撳紑閮ㄩ棬灏忕獥浣�
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "渚涘簲鍟嗗垪琛�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptIDName").val(checkStatus.data[0].HName);
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //閫夋嫨甯佸埆
+            function get_btnHSettleCurrId() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "甯佸埆鍒楄〃"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        $("#HSettleCurrId").val(checkStatus.data[0].HItemID);
+                        $("#HSettleCurrIdName").val(checkStatus.data[0].璐у竵鍚嶇О);
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //琛屽揩鎹烽敭
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            //鎵撳紑鐗╂枡  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterNumber": checkStatus.data[0].HNumber
+                                        , "HMaterName": checkStatus.data[0].HName
+                                        , "HMaterModel": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+
+                        //璁¢噺鍗曚綅
+                        if (obj.event == "HUnitID") {
+                            //鎵撳紑璁¢噺鍗曚綅灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_UnitList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HUnitID": checkStatus.data[0].HItemID
+                                        , "HUnitIDName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+
+                        //閲囪喘閮ㄩ棬
+                        if (obj.event == "HICMOEmpID") {
+                            //鎵撳紑閲囪喘閮ㄩ棬灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "閮ㄩ棬鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HICMOEmpID": checkStatus.data[0].HItemID
+                                        , "HICMOEmpIDName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HAddress": d.data[0].浜よ揣鍦扮偣
+                            , "HProdORGID": d.data[0].涓荤敓浜х粍缁�
+                            , "HDeptID": d.data[0].HDeptID
+                            , "HDeptIDName": d.data[0].杞﹂棿鍚嶇О
+                            , "HSettleCurrId": d.data[0].HSettleCurrId
+                            , "HSettleCurrIdName": d.data[0].缁撶畻甯佸埆
+                            , "HDate": Format(new Date(d.data[0].鏃ユ湡),'yyyy-MM-dd')
+                            , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            , "HExplanation": d.data[0].鎽樿
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠g爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
+                            , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁¢噺鍗曚綅
+                            , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HProdORGID": d.data[0].瀛愮敓浜х粍缁�
+                            , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
+                            , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd')
+                            , "HRelationQty": d.data[0].鍏宠仈鏁伴噺, "HICMOInterID": d.data[0].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟瀛愬唴鐮�
+                            , "HICMOBillSEQ": d.data[0].鐢熶骇璁㈠崟琛屽彿, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd')
+                            , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HReciveQty": d.data[0].鍏ュ簱鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false
+                            , "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿, "HICMOEmpID": d.data[0].HICMOEmpID, "HICMOEmpIDName": d.data[0].鐢熶骇璁㈠崟鍒跺崟浜�
+                            , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HICMOBillDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd')
+                            , "HICMOBillDeliveryDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[0].鐢熶骇璁㈠崟鎽樿
+                            , "HICMOBillNote": d.data[0].鐢熶骇璁㈠崟琛ㄤ綋澶囨敞
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+
+                        //鏄惁鎵嬪伐鍏抽棴
+                        if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
+                            $('#HCloseTypeSub1').attr("checked", true);
+                        }
+
+                        //鍏抽棴鐘舵��
+                        if (d.data[0].鍏抽棴鐘舵�� == "1") {
+                            $('#HCloseStatus1').attr("checked", true);
+                        }
+                        form.render('checkbox');
+
+                        //寤惰繜鍘熷洜
+                        $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
+                        //鐗╂枡灞炴��
+                        $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
+                        //鐢熶骇缁勭粐
+                        $('#HProdORGIDSub1').find("option[value='" + d.data[0].瀛愮敓浜х粍缁� + "']").attr("selected", true);
+                        //鐘舵��
+                        $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        //鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
+                        if (table.cache["mainTable"][i].HEntryCloseDate == "") {
+                            table.cache["mainTable"][i].HEntryCloseDate = "1900-01-01 00:00:00.000"
+                        }
+
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_WorkDemandPlanBill/AddWorkDemandPlanBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //闈炵┖楠岃瘉
+            function AllowLoadData() {
+
+                if ($("#HSettleCurrId").val() == "0") {
+                    layer.msg("甯佸埆娌℃湁閫夋嫨");
+                    return false;
+                }
+                return true;
+            }
+
+            //#endregion
+
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
new file mode 100644
index 0000000..1ac8e71
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -0,0 +1,432 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>瑕佹枡璁″垝鍗曞垪琛�</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-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" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">閲囪喘缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="Organization" id="Organization" lay-verify="Organization">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <!--鍏朵粬鏉′欢-->
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+                //鍏抽棴
+                case 'set_CloseBill': set_CloseBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 鐢熶骇杞﹂棿
+        form.on('submit(btnHWorkShopID)', function (data) {
+            btnHWorkShopID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鐢熶骇缁勭粐鍔犺浇
+            Organ();
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', hide: true }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
+                    , { 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: '鐢熶骇缁勭粐' }
+                    , { field: '杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿' }
+                    , { field: '婧愬崟鍗曞彿', title: '鐢熶骇璁㈠崟鍙�' }
+                    , { field: '鏁伴噺', title: '鏁伴噺' }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                    , { field: '宸ュ崟鐢熶骇鏃ユ湡', title: '宸ュ崟鐢熶骇鏃ユ湡' }
+                    , { field: '寤惰繜鍘熷洜', title: '寤惰繜鍘熷洜' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '<option  style="color:blue;" value="">缁勭粐</option>';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#Organization").append(Organization);
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var Organization = $("#Organization").val();//閲囪喘缁勭粐
+            var HWorkShopIDName = $("#HWorkShopIDName").val();//鐢熶骇杞﹂棿
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (Organization) {
+                sWhere += " and 涓昏〃閲囪喘缁勭粐 = '" + Organization + "'";
+            }
+            if (HWorkShopIDName) {
+                sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "'";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HBillNo").val("");
+            $("#Organization").val("");//閲囪喘缁勭粐
+            $("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
+            $("#HWorkShopID").val("");//鐢熶骇杞﹂棿
+            sWhere = "";
+        }
+        //#endregion
+
+        //鐢熶骇杞﹂棿鍒楄〃
+        function btnHWorkShopID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_WorkDemandPlanBill/DelWorkDemandPlanBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //鍏抽棴
+        function set_CloseBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_WorkDemandPlanBill/CloseWorkDemandPlanBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '瑕佹枡璁″垝鍗曞垪琛�-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+        //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '瑕佹枡璁″垝鍗曞垪琛�-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+        //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
new file mode 100644
index 0000000..e1095fa
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -0,0 +1,265 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-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" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <!--<div class="layui-colla-content">
+                <div class="layui-inline">
+                    <div class="layui-inline">
+                        <span>鍏朵粬鏉′欢></span>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="鐗╂枡浠g爜" id="鐗╂枡浠g爜">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">璧勬簮浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="璧勬簮浠g爜" id="璧勬簮浠g爜">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">閮ㄩ棬浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="閮ㄩ棬浠g爜" id="閮ㄩ棬浠g爜">
+                    </div>
+                </div>
+            </div>-->
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#region 鐢熶骇杞﹂棿
+        form.on('submit(btnHWorkShopID)', function (data) {
+            btnHWorkShopID();
+        });
+        //#endregion
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'HinterId', title: 'HinterId', hide: true }
+                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
+                    , { field: '鏃ヨ鍒掕鍗曞瓙鍐呯爜', title: '鏃ヨ鍒掕鍗曞瓙鍐呯爜', hide: true }
+                    , { field: '鏃ヨ鍒掕鍗曚富鍐呯爜', title: '鏃ヨ鍒掕鍗曚富鍐呯爜', hide: true }
+                    , { field: '涓荤敓浜ц鍗曞瓙鍐呯爜', title: '涓荤敓浜ц鍗曞瓙鍐呯爜', hide: true }
+                    , { field: '涓荤敓浜ц鍗曚富鍐呯爜', title: '涓荤敓浜ц鍗曚富鍐呯爜', hide: true }
+                    , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�' }
+                    , { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true }
+                    , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜'  }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺' }
+                    , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
+                    , { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺' }
+                    , { field: '棰嗘枡鍗犵敤鏁伴噺', title: '棰嗘枡鍗犵敤鏁伴噺' }
+                    , { field: '鍙敤鏁伴噺', title: '鍙敤鏁伴噺' }
+                    , { field: '鍗犵敤鏁伴噺', title: '鍗犵敤鏁伴噺' }
+                    , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺' }
+                    , { field: '榻愬鍒嗘瀽璁$畻鏃堕棿', title: '榻愬鍒嗘瀽璁$畻鏃堕棿' }
+                    , { field: '鐢熶骇杞﹂棿ID', title: '鐢熶骇杞﹂棿ID', hide: true }
+                    , { field: '鐢熶骇杞﹂棿缂栫爜', title: '鐢熶骇杞﹂棿缂栫爜' }
+                    , { field: '鐢熶骇杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿鍚嶇О' }
+                    , { field: '浠撳簱ID', title: '浠撳簱ID', hide: true }
+                    , { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
+                    , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/JIT_Complete/JIT_CompleteDetailList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var HWorkShopIDName = $("#HWorkShopIDName").val();
+         
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (HWorkShopIDName) {
+                sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "'";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HWorkShopIDName").val("");
+            $("#HBillNo").val("");
+            $("#HWorkShopID").val("");
+            sWhere = "";
+        }
+        //#endregion
+
+        //鐢熶骇杞﹂棿鍒楄〃
+        function btnHWorkShopID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterialDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterialDetailList.html"
new file mode 100644
index 0000000..d1f0d3f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterialDetailList.html"
@@ -0,0 +1,361 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>榻愬鍒嗘瀽鐗╂枡鍗犵敤鏄庣粏鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-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" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <!--<div class="layui-colla-content">
+                <div class="layui-inline">
+                    <div class="layui-inline">
+                        <span>鍏朵粬鏉′欢></span>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="鐗╂枡浠g爜" id="鐗╂枡浠g爜">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">璧勬簮浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="璧勬簮浠g爜" id="璧勬簮浠g爜">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">閮ㄩ棬浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="閮ㄩ棬浠g爜" id="閮ㄩ棬浠g爜">
+                    </div>
+                </div>
+            </div>-->
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 鐢熶骇杞﹂棿
+        form.on('submit(btnHWorkShopID)', function (data) {
+            btnHWorkShopID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'HinterId', title: 'HinterId', hide: true }
+                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
+                    , { field: '鏃ヨ鍒掕鍗曞瓙鍐呯爜', title: '鏃ヨ鍒掕鍗曞瓙鍐呯爜', hide: true }
+                    , { field: '鏃ヨ鍒掕鍗曚富鍐呯爜', title: '鏃ヨ鍒掕鍗曚富鍐呯爜', hide: true }
+                    , { field: '涓荤敓浜ц鍗曞瓙鍐呯爜', title: '涓荤敓浜ц鍗曞瓙鍐呯爜', hide: true }
+                    , { field: '涓荤敓浜ц鍗曚富鍐呯爜', title: '涓荤敓浜ц鍗曚富鍐呯爜', hide: true }
+                    , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�' }
+                    , { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true }
+                    , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '榻愬鏁伴噺', title: '鍗犵敤搴撳瓨鏁伴噺' }
+                    , { field: '棰嗘枡鍗犵敤鏁伴噺', title: '棰嗘枡鍗犵敤鏁伴噺' }
+                    , { field: '鍗犵敤鏁伴噺', title: '鍗犵敤鏁伴噺' }
+                    , { field: '褰撳墠搴撳瓨鏁伴噺', title: '鍙敤鏁伴噺' }
+                    , { field: '榻愬鍒嗘瀽璁$畻鏃堕棿', title: '榻愬鍒嗘瀽璁$畻鏃堕棿' }
+                    , { field: '鐢熶骇杞﹂棿ID', title: '鐢熶骇杞﹂棿ID', hide: true }
+                    , { field: '鐢熶骇杞﹂棿缂栫爜', title: '鐢熶骇杞﹂棿缂栫爜' }
+                    , { field: '鐢熶骇杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿鍚嶇О' }
+                    , { field: '浠撳簱ID', title: '浠撳簱ID', hide: true }
+                    , { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
+                    , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/JIT_Complete/JIT_CompleteMaterialDetailList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var HWorkShopIDName = $("#HWorkShopIDName").val();
+         
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (HWorkShopIDName) {
+                sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "'";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HWorkShopIDName").val("");
+            $("#HBillNo").val("");
+            $("#HWorkShopID").val("");
+            sWhere = "";
+        }
+        //#endregion
+
+        //鐢熶骇杞﹂棿鍒楄〃
+        function btnHWorkShopID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/DelComplementGoodBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+            //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index c375c23..2ccb217 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -719,7 +719,6 @@
                         table.render(option);
 
                         for (var i = 1; i <= option.data.length; i++) {
-                            console.log(option.data[i - 1].HSupFlag)
                             $('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
                             //濮斿鍗忓姪
                             if (option.data[i - 1].HSupFlag) {
@@ -1360,7 +1359,7 @@
                         }];
                         option.data = rowdata;
                         table.render(option);
-
+                      
                         if (d.data[0].濮斿鏍囪) {
                             $('#HSupFlag1').attr("checked", true);
                         }
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index d1082e0..30bd422 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -68,10 +68,10 @@
                                 <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 class="layui-inline">
+            <span>鍏朵粬鏉′欢></span>
+        </div>
+    </div>-->
                                     <div class="layui-inline">
                                         <label class="layui-form-label">鍗曟嵁鍙�</label>
                                         <div class="layui-input-block">
@@ -96,11 +96,11 @@
                                         </div>
                                     </div>
                                     <!--<div class="layui-inline">
-            <label class="layui-form-label">鍙嶉鐘舵��</label>
-            <div class="layui-input-block">
-                <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
-            </div>
-        </div>-->
+        <label class="layui-form-label">鍙嶉鐘舵��</label>
+        <div class="layui-input-block">
+            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+        </div>
+    </div>-->
                                     <div class="layui-inline">
                                         <label class="layui-form-label">鐗╂枡缂栫爜</label>
                                         <div class="layui-input-block">
@@ -126,7 +126,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline" style="margin-left:30px">
-                                        <label class="layui-form-label">渚涘簲鍟嗗弽棣堢姸鎬�</label>
+                                        <label class="layui-form-label">鍙嶉鐘舵��</label>
                                         <div class="layui-input-block" style="width:190px;">
                                             <select name="HFeedback" lay-filter="HFeedback">
                                                 <option value="" selected>鍏ㄩ儴</option>
@@ -137,7 +137,15 @@
                                             </select>
                                         </div>
                                     </div>
-
+                                    <div class="layui-inline" style="margin-left:30px">
+                                        <label class="layui-form-label">瀹屾垚鐘舵��</label>
+                                        <div class="layui-input-block" style="width:190px;">
+                                            <select name="HFinishStatus" lay-filter="HFinishStatus">
+                                                <option value="鏈畬鎴�" selected>鏈畬鎴�</option>
+                                                <option value="宸插畬鎴�">宸插畬鎴�</option>
+                                            </select>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -187,12 +195,8 @@
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
-            //鍒濆鍖栬〃鏍�
-            set_InitGrid();
-            //鍔犺浇鏁版嵁鍒扮綉鏍�
-            get_Display(sWhere);
-            //鍔犺浇涓氬姟鍛�
-            get_HEmpName();
+            set_ClearBill();
+        
             //#endregion
 
             //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -285,11 +289,18 @@
             });
             //#endregion
 
-
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery(table, option)
+                //鍔犺浇涓氬姟鍛�
+                get_HEmpName();
+            }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HBeginDate").val("2022-03-14");
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 var columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
@@ -312,6 +323,7 @@
                     , { field: '鎵撳嵃鏉$爜鏁伴噺', title: '鎵撳嵃鏉$爜鏁伴噺', width: 120}
                     , { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
                     , { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
+                    , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
                     , { field: 'HUnitID', title: 'HUnitID', hide: true }
                     , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
                     , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100 }
@@ -997,6 +1009,8 @@
                 var HMaterShortNumber = $("#HMaterShortNumber").val();
                 var HSupName = $("#HSupName").val();//渚涘簲鍟�
                 var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
+                var HFinishStatus = $("select[name='HFinishStatus']").val(); //瀹屾垚鐘舵��
+
                 if (HStatus) {
                     sWhere += " and 鍒嗛厤鐘舵�� like '%" + HStatus + "%'";
                 }
@@ -1040,6 +1054,10 @@
                     sWhere += " and 鍙嶉鐘舵�� like '%" + HFeedback + "%'";
 
                 }
+                if (HFinishStatus) {
+                    sWhere += " and 瀹屾垚鐘舵�� like '%" + HFinishStatus + "%'";
+
+                }
                 var index = layer.load(0);
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index c710f58..52e621d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -103,11 +103,11 @@
                                         </div>
                                     </div>
                                     <!--<div class="layui-inline">
-                                        <label class="layui-form-label">鍙嶉鐘舵��</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
-                                        </div>
-                                    </div>-->
+        <label class="layui-form-label">鍙嶉鐘舵��</label>
+        <div class="layui-input-block">
+            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+        </div>
+    </div>-->
                                     <div class="layui-inline">
                                         <label class="layui-form-label">鐗╂枡缂栫爜</label>
                                         <div class="layui-input-block">
@@ -133,7 +133,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline" style="margin-left:30px">
-                                        <label class="layui-form-label">渚涘簲鍟嗗弽棣堢姸鎬�</label>
+                                        <label class="layui-form-label">鍙嶉鐘舵��</label>
                                         <div class="layui-input-block" style="width:190px;">
                                             <select name="HFeedback" lay-filter="HFeedback">
                                                 <option value="" selected>鍏ㄩ儴</option>
@@ -141,6 +141,15 @@
                                                 <option value="澶囨枡">澶囨枡</option>
                                                 <option value="鐢熶骇">鐢熶骇</option>
                                                 <option value="鍙戣揣">鍙戣揣</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline" style="margin-left:30px">
+                                        <label class="layui-form-label">瀹屾垚鐘舵��</label>
+                                        <div class="layui-input-block" style="width:190px;">
+                                            <select name="HFinishStatus" lay-filter="HFinishStatus">
+                                                <option value="鏈畬鎴�" selected>鏈畬鎴�</option>
+                                                <option value="宸插畬鎴�">宸插畬鎴�</option>
                                             </select>
                                         </div>
                                     </div>
@@ -293,14 +302,14 @@
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-                //鍔犺浇鏁版嵁鍒扮綉鏍�
-                get_Display(sWhere);
+                //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery(table, option)
                 //鍔犺浇涓氬姟鍛�
                 get_HEmpName();
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HBeginDate").val("2022-03-14");
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 var columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
@@ -323,6 +332,7 @@
                     , { field: '鎵撳嵃鏉$爜鏁伴噺', title: '鎵撳嵃鏉$爜鏁伴噺', width: 120 }
                     , { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
                     , { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
+                    , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
                     , { field: 'HUnitID', title: 'HUnitID', hide: true }
                     , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
                     , { field: 'HUnitID', title: 'HUnitID', hide: true }
@@ -1007,6 +1017,7 @@
                 //var HXTFKStatus = $("#HXTFKStatus").val();
                 var HSupName = $("#HSupName").val();//渚涘簲鍟�
                 var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
+                var HFinishStatus = $("select[name='HFinishStatus']").val(); //瀹屾垚鐘舵��
 
                 if (HStatus) {
                     sWhere += " and 鍒嗛厤鐘舵�� like '%" + HStatus + "%'";
@@ -1051,6 +1062,10 @@
                     sWhere += " and 鍙嶉鐘舵�� like '%" + HFeedback + "%'";
 
                 }
+                if (HFinishStatus) {
+                    sWhere += " and 瀹屾垚鐘舵�� like '%" + HFinishStatus + "%'";
+
+                }
                 var index = layer.load(0);
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
index 5d9699b..51db73e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
@@ -291,9 +291,10 @@
         form.on('submit(cmdQuery)', function () {
             var HBillNo = $("#HBillNo").val();
             var HSourceBillNo = $("#HSourceBillNo").val();
+            var index = layer.load();//閬僵
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             $.ajax({
-                url: GetWEBURL() + '/Gy_Mould/list1',
+                url: GetWEBURL() + '/Web/QueryBillUpdateLoad_Json',
                 type: "GET",
                 data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
                 success: function (data1) {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
new file mode 100644
index 0000000..561aea2
--- /dev/null
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -0,0 +1,1033 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>濮斿鍑哄簱</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 5px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>濮斿鍑哄簱鍗�</span>
+                    </div>
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
+                        <div class="layui-row" style="display:none;">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:60px;padding-left:0px;">MES搴撲綅</label>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">
+                                <input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">
+                                <input type="hidden" name="HExplanation" id="HExplanation" value="" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-col-xs12" lay-filter="tab-Kf_EntrustInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">婧愬崟淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
+                            <li lay-id="4" style="padding:1px;">鍚堣淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--婧愬崟淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" value="濮斿鐢ㄦ枡娓呭崟" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
+                                            <input type="hidden" value="1604" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
+
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍗曟嵁淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
+                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">渚涘簲鍟�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">淇濈</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">鍙戣揣浜哄憳</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;display:none">鍒跺崟浜�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HBillerID" id="HBillerID" lay-verify="HBillerID" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HMakerID" id="HMakerID" lay-verify="HMakerID" value="0" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">閮ㄩ棬</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鐗╂枡娓呭崟-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                                                </div>
+                                                <div class="layui-col-xs8">
+                                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍚堣淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉$爜鏁伴噺</label>
+                                    </div>
+                                    <div class="layui-col-xs8 layui-input-inline mobile">
+                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鎬绘暟閲�</label>
+                                    </div>
+                                    <div class="layui-col-xs8 layui-input-inline mobile">
+                                        <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ュ織</label>
+                                    </div>
+                                    <div class="layui-col-xs8 layui-input-inline mobile">
+                                        <!--<input type="text" name="HNote" id="HNote" lay-verify="HNote" autocomplete="off" class="layui-input">-->
+                                        <textarea id="rizhi" style="height: 200px;width: 100%;"></textarea>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </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/zgqCustom/zgqCustom.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            var RZ = "";
+            var Flag = sessionStorage["SourceFlag"];
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+            $("#HWHID").val(sessionStorage["HWHID"]);
+            $("#HWHNAME").val(sessionStorage["HWHName"]);
+            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+            //$("#HSupID").val(sessionStorage["HSupID"]);
+            //$("#HSupName").val(sessionStorage["HSupName"]);
+            $("#HDeptID").val(sessionStorage["HDeptID"]);
+            $("#HDeptName").val(sessionStorage["HDept"]);
+            $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
+            $("#HSecManager").val(sessionStorage["HSecManager"]);
+            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+            $("#HKeeper").val(sessionStorage["HKeeper"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMaker").hide();
+            $("#HMakerID").hide();
+            $("#HBillerID").val(sessionStorage["HBillerID"]);
+            $("#HBillerID").hide();
+
+
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            //鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetPonderationBill",
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (d) {
+                        // console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HBillType").val(d.data[0].HSourceBillType);
+                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+                        //$("#HWHID").val(d.data[0].HWhID);
+                        //$("#HKeeperID").val(d.data[0].HKeeperID);
+                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
+                        //$("#HDeptID").val(d.data[0].HDeptID);
+                        //$("#HBarCode").val(d.data[0].HBarCode);
+                        //$("#HQty").val(d.data[0].HQty);
+                    }
+                })
+            }
+
+            //鍔犺浇琛ㄤ綋
+            function RoadBillSub(linterid) {
+                table.render({
+                    elem: '#wl-table'
+                    , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillID: linterid, HBillType: '1211', sWhere: '' }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                        , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+
+
+
+
+
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1211' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+                RoadBillSub(linterid);
+            }
+
+            //閫夋嫨璋冨叆浠撳簱
+            form.on('submit(HWHID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //閫夋嫨璋冨叆浠撲綅
+            form.on('submit(HSpID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //閫夋嫨渚涘簲鍟�
+            form.on('submit(HSupID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '渚涘簲鍟嗗垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+           
+            //閫夋嫨淇濈
+            form.on('submit(HKeeperID-BT)', function () {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeper").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            //閫夋嫨鍙戣揣
+            form.on('submit(HSecManagerID-BT)', function (data) {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManager").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            //閫夋嫨閮ㄩ棬
+            form.on('submit(HDeptID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //缂栬緫鎸夐挳
+            form.on('submit(cmdModify)', function () {
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                    }
+                })
+            });
+
+            //鍏抽棴鎸夐挳
+            form.on('submit(Cancel)', function () {
+                Flag = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+
+            //鎻愪氦鎸夐挳
+            form.on('submit(Saver)', function (data) {
+                if ($("#HExplanation").val() == "") {
+                    if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+                        $("#HWHNAME").val("");
+                        $("#HWHID").val("");
+                        layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            //url: "http://localhost:12761/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            //url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json",
+                            url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustOutBill_Json",
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm("鐢熸垚濮斿鍑哄簱鍗�" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1,
+                                        skin: 'layui-layer-lan',
+                                        closeBtn: 0,
+                                        btn: ['鏂板'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }
+                                        , function () { window.location.reload(); }//鏂板
+                                    );
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                                layui.form.render();
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    return false;
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //鎵潯鐮�
+            $('#HBarCode').on('keydown', function (event) {
+                var sQty = $("#HQty").val()
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode
+                }
+            }); 
+
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageBySourceBillNo();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
+            });
+
+
+            //鎵粨浣�
+            $('#HStockPlaceName').on('keydown', function (event) {
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HWHNAME").val(result.data[0].HWhName);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/Kf_EntrustInBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+
+            //鎵玀ES浠撲綅
+            $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HMESSPName').val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                $("#HMESSPID").val(result.data[0].HWHID);
+                                $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+                                $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+                                $.ajax({
+                                    url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+                                    type: "GET",
+                                    data: { "HERPWHID": result.data[0].HWHID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            $("#HWHID").val(result.data[0].HMESWHID);
+                                            $("#HWHNAME").val(result.data[0].HMESWHNAME);
+                                            $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+                                            $("#HMESSPName").css("background-color", "#efefef4d");
+                                        }
+                                        else {
+                                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sHBillType = $("#HBillType").val()
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo = $("#HSourceBillNo").val()
+                var sQty = $("#HQty").val()
+                //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (sBarCode != "") {
+                    $('#HBarCode').val("");
+                }
+                if (sQty != "") {
+                    $('#HQty').val("");
+                }
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
+                    url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
+                    type: "GET",
+                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            playSound1();
+                            if (result.data.HBarType == '浠撳簱鏉$爜') {
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                $("#HStockPlaceName").val("");
+                                //$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佷粨搴撴潯鐮侊紝鎴愬姛\n");
+                                element.tabChange('tab-Kf_EntrustInBill', '2');  //璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '浠撲綅鏉$爜') {
+                                $("#HStockPlaceName").val(result.data.HSPName);
+                                $("#HStockPlaceID").val(result.data.HSPID);
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                //$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佷粨浣嶆潯鐮侊紝鎴愬姛\n");
+                                element.tabChange('tab-Kf_EntrustInBill', '2');//璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
+                                $("#HDeptName").val(result.data.HDeptName);
+                                $("#HDeptID").val(result.data.HDeptID);
+                                //$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侀儴闂ㄦ潯鐮侊紝鎴愬姛\n");
+                                element.tabChange('tab-Kf_EntrustInBill', '2');//璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '婧愬崟鏉$爜') {
+                                $("#HSupName").val(result.data.HSupName);
+                                $("#HSupID").val(result.data.HSupID);
+                                $("#HDeptName").val(result.data.HDeptName);
+                                $("#HDeptID").val(result.data.HDeptID);
+                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                Flag = true;
+                                //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                if (result.data.HSourceBillType == "1604") {
+                                    $("#HBillType").val("1604");
+
+                                }
+                                else {
+                                    $("#HBillType").val("鎵嬪伐褰曞叆");
+                                }
+                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佹簮鍗曟潯鐮侊紝鎴愬姛\n");
+                                element.tabChange('tab-Kf_EntrustInBill', '3');
+                            }
+                            else {
+                                if (Flag == "true") {
+                                    element.tabChange('tab-Kf_EntrustInBill', '3');
+                                }
+                                else {
+                                    //$("#HSupName").val(result.data.HSupName);                20210719淇敼
+                                    //$("#HSupID").val(result.data.HSupID);                    20210719淇敼
+                                    //$("#HDeptName").val(result.data.HDeptName);
+                                    //$("#HDeptID").val(result.data.HDeptID);
+                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                    Flag = true;
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    if (result.data.HSourceBillType == "1604") {
+                                        $("#HBillType").val("1604");
+
+                                    }
+                                    else {
+                                        $("#HBillType").val("鎵嬪伐褰曞叆");
+                                    }
+                                    //$("#HNote").val(";鐗╂枡鏉$爜");
+                                    $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佺墿鏂欐潯鐮侊紝鎴愬姛\n");
+                                    element.tabChange('tab-Kf_EntrustInBill', '3');
+                                }
+                            }
+                            
+                            layer.load(3)
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
+                                , cellMinWidth: 90
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                ]]
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        playSound();
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            function playSound() {
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+            function playSound1() {
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                if (HSourceBillNo == "" || sInterID <= 0) {
+                    layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                //
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    url: GetWEBURL() + "/Kf_EntrustInBill/GetWW_PPBomBillMainByHSourceBillNo",
+                    type: "GET",
+                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            playSound1();
+                            $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曪紝鎴愬姛\n");
+                            $("#HSupID").val(result.data[0].HSupID);
+                            $("#HSupName").val(result.data[0].HSupName);
+
+                            Flag = true;
+                            layer.load(3);
+                            element.tabChange('tab-Kf_EntrustInBill', '2');
+
+                            table.render({
+                                elem: '#wl-table'
+                                //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+                                , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                ]]
+                                // , data: [linterid]
+                                // , page: true
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+        });
+        //浠ヤ笂涓簂ayui妯″潡
+        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+        {
+            $("#HWHNAME").val(obj[0].HName);
+            //sessionStorage["HWHID"] = obj[0].HItemID;
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+            $("#HStockPlaceName").val(obj[0].HName);
+            $("#HStockPlaceID").val(obj[0].HItemID);
+        }
+        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+            $("#HSupName").val(obj[0].HName);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHKeeperValue(obj) {  //杩斿洖淇濈
+            $("#HKeeper").val(obj[0].HName);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+            $("#HSecManager").val(obj[0].HName);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        //function Get_CheckWhAndSP(sInterID, sHBillType, sBarCode, sHWHID, sHSPID) {   //杩斿洖閮ㄩ棬
+        //    $.ajax({
+        //        url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/Get_CheckWhAndSP_Josn",
+        //        type: "GET",
+        //        data: { "sHInterID": sInterID, "sHBillType": sHBillType, "sBarCode": sBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID },
+        //        success: function (result) {
+        //            if(result.count==1)
+        //            {
+        //               // layer.msg(result.Message, { icon: 1 });
+        //                return true;
+        //            }
+        //            else
+        //            {
+        //                layer.msg(result.Message, { icon: 5 });
+        //                return false;
+        //            }
+        //        }
+        //    })
+        //}
+        function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+            //if ($("#HSourceBillNo").val() == '') {
+            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HDeptName").val() == '') {
+            //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HSecManager").val() == '') {
+            //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HKeeper").val() == '') {
+            //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HSupName").val() == '') {
+            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HWHNAME").val() == '') {
+            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (bnt == 'Saver') {
+                if (!typeof (sSubStr) == "undefined") {
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                                layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                return false;
+                            }
+                        }
+                    }
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("濮斿鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                }
+            }
+            else {
+                return true;
+            }
+        }
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_FastList.html"
new file mode 100644
index 0000000..6c410f2
--- /dev/null
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_FastList.html"
@@ -0,0 +1,387 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>濮斿棰嗘枡鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-POStockInBillList">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2">宸蹭笂浼犲垪琛�</li>
+                            <li lay-id="3">宸蹭笂浼犳煡璇�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item  layui-show">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="yd-table" lay-filter="yd-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <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="HSourceBillNo" id="HSourceBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">鏌ヨ</button>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="sy-table" lay-filter="sy-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>-->
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </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>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            //娓呯┖鐣岄潰  new
+            var sBillType = '1211'
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+            //鍔犺浇婧愬崟绫诲瀷
+
+            //璇诲彇鍗曟嵁鍒楄〃
+            //
+
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {
+                var checkStatus = table.checkStatus('dj-table')
+                    , data = checkStatus.data;
+                //ajaxLabelData = data;
+                //layer.alert(rows);
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '濮斿鍑哄簱鍗�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        $(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //鍒锋柊
+            form.on('submit(cmdRefresh)', function () {//
+                table.render({
+                    elem: '#dj-table'
+                    , url: GetWEBURL() + '/Web/chanpinruk'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                        , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                }),
+                    table.render({
+                        elem: '#yd-table'
+                        , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+                        , toolbar: '#toolbarDemo'
+                        , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                        , cols: [[
+                            { type: 'radio' }
+                            , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                            , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                            , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                            , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+                        ]]
+                        , height: 500
+                        , done: function () {
+                            layer.closeAll("loading");
+                        }
+                    })
+            });
+            //鎾ら攢鍔熻兘
+            form.on('submit(cmdRescind)', function () {
+                var checkStatus = table.checkStatus('yd-table')
+                    , data = checkStatus.data;
+                var sInterID = data[0].HInterID
+                var sBillNo = data[0].HBillNo
+                var sBillType = '1210'
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/Web/Rescind_Json",
+                        async: true,
+                        data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, {
+                                icon: 5,
+                                time: 20000
+                            }, function () {
+                                //do something
+                            });
+                        }
+                    });
+            });
+            //鍒犻櫎
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('dj-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var sInterID = data[0].HInterID;
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/ProductInBillList/Delete_Json",
+                                async: true,
+                                data: { "sHInterID": sInterID },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+                                        layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                        });
+                                    }
+                                    else {
+                                        layer.msg(data.Message, { icon: 2 });
+                                    }
+                                },
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, {
+                                        icon: 5,
+                                        time: 20000
+                                    }, function () {
+                                        //do something
+                                    });
+                                }
+                            });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            });
+            //鏌ヨ
+            form.on('submit(cmdQuery)', function () {
+                var HBillNo = $("#HBillNo").val();
+                var HSourceBillNo = $("#HSourceBillNo").val();
+                var index = layer.load();//閬僵
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Web/QueryBillUpdateLoad_Json',
+                    type: "GET",
+                    data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            });
+
+
+
+
+
+            table.render({
+                elem: '#dj-table'
+                , url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            })
+
+
+            //宸蹭笂浼犲垪琛�
+            table.render({
+                elem: '#yd-table'
+                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+                , toolbar: '#toolbarDemo'
+                , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                    , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            })
+
+            //宸蹭笂浼犳煡璇�
+            table.render({
+                elem: '#sy-table'
+                , toolbar: '#toolbarDemo'
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                    , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+                ]]
+                , height: 500
+            })
+
+            //鍒锋柊鏄庣粏椤电
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+        });
+        //娓呯┖琛ㄥご
+    </script>
+
+</body>
+</html>

--
Gitblit v1.9.1