From 116797b11b346f8fb75fdbf01c75e51241449974 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 26 四月 2022 16:33:52 +0800
Subject: [PATCH] nothing

---
 WebTM/WebTM.csproj.user                                        |    2 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ICMOBillList.aspx            |   12 
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html           |    8 
 WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html           |    4 
 WebTM/views/模治具管理/模治具管理/BatchGen_MouldFile.html                |   10 
 WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html           |   10 
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html              |   67 ++++-
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user              |   78 ++++-
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html           |  476 ++++++++++++++++++++++++++---------
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html              |    4 
 WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html |   12 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                      |    2 
 WebTM/views/index.html                                         |    2 
 WebTM/views/基础资料/公用基础资料/Gy_Currency.html                       |   36 +-
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html                  |    1 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                    |    2 
 WebTM/WebTM.csproj                                             |    1 
 17 files changed, 517 insertions(+), 210 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 0400e90..9d223dc 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-19T08:20:09.8422169Z;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/19/2022 16:19:30</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>04/13/2022 10:16:48</publishTime>
+      <publishTime>04/19/2022 16:19:30</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/19/2022 10:43:59</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>
@@ -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>
@@ -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>
@@ -2726,6 +2726,24 @@
     <File Include="views/鐢熶骇绠$悊/鎷f枡閰嶉�佸崟/JIT_ComplementGoodsList.html">
       <publishTime>04/01/2022 17:41:37</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/19/2022 10:43:59</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/19/2022 10:43:59</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">
+      <publishTime>04/19/2022 10:43:59</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html">
+      <publishTime>04/19/2022 10:43:59</publishTime>
+    </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇涓婃枡鍗�/Sc_MaterToSourceBillList - 澶嶅埗.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
@@ -2805,7 +2823,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>
@@ -2827,6 +2848,9 @@
     </File>
     <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>
@@ -3255,7 +3279,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 +3294,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 +3324,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 +3333,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 +3471,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 +3498,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 +3522,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/19/2022 16:20:04</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index fdbe7ea..6902516 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -860,6 +860,7 @@
     <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" />
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/views/index.html b/WebTM/views/index.html
index 31c979a..3b4c284 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -371,7 +371,7 @@
                                             <a>瑕佹枡璁″垝</a>
                                             <dl class="layui-nav-child">
                                                 <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
-                                                <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_LiftMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
                                             </dl>
                                         </dd>
                                         <dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/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_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..0d2e839 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+")");
+            
             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_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/\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"
index 03b27a2..3921b40 100644
--- "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"
@@ -61,7 +61,7 @@
                                 <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_DeleteBill"><i class="layui-icon layui-icon-logout"></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>
@@ -118,7 +118,7 @@
                 case 'set_DeleteBill': set_DeleteBill();
                     break;
                 //鍏抽棴
-                case 'set_DeleteBill': set_CloseBill();
+                case 'set_CloseBill': set_CloseBill();
                     break;
             };
         });
@@ -230,7 +230,7 @@
         //鑾峰彇缁勭粐
         function Organ() {
             //鑾峰彇鐧诲綍椤电粍缁囧垪
-            var Organization = '';
+            var Organization = '<option  style="color:blue;" value="">缁勭粐</option>';
             $.ajax({
                 type: "get",
                 url: GetWEBURL() + "/Web/GetOrganizations",
@@ -382,7 +382,7 @@
                         var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
 
                         $.ajax({
-                            url: GetWEBURL() + '/Cg_PODemandPlanBill/DelPODemandPlanBillList'
+                            url: GetWEBURL() + '/Cg_PODemandPlanBill/ClosePODemandPlanBillList'
                             , type: "GET"
                             , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
                             , success: function (result) {
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"
index 04d5552..9cc139f 100644
--- "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"
@@ -71,19 +71,17 @@
                                             </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="HSubORGID" name="HSubORGID" id="HSubORGID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="text" class="layui-input" lay-verify="HSubORGIDName" name="HSubORGIDName" id="HSubORGIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSubORGID" id="btnHSubORGID" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
+                                            <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 ">
+                                                <input type="text" class="layui-input" lay-verify="HAddress" name="HAddress" id="HAddress">
                                             </div>
                                         </div>
                                     </div>
@@ -121,7 +119,7 @@
                                         <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: 48px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -202,6 +200,26 @@
         </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;">
@@ -209,10 +227,10 @@
         </div>
     </script>
 
-    <!--鏃堕棿 宸ュ崟鐢熶骇鏃ユ湡-->
-    <script type="text/html" id="HDayPlanDate">
-        <div class="layui-input-block" style="margin-left: 0px;margin-top:-6px;width:100%">
-            <input type="date" name="HDayPlanDate" lay-filter="HDayPlanDate" id="HDayPlanDate{{d.LAY_TABLE_INDEX+1}}" class="layui-input">
+    <!--澶嶉�夋 鏄惁鎵嬪伐鍏抽棴-->
+    <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>
 
@@ -231,13 +249,19 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
 
             //鍒濆琛ㄦ牸鏁版嵁
             var rowdata = [{
-                "HSupplierID": "", "HSupplierNumber": "", "HSupplierName": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
-                , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
-                , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+                "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
@@ -295,44 +319,47 @@
                     , { field: 'HLaterReason', title: '寤惰繜鍘熷洜', templet: '#HLaterReason', width: 200 }//list
                     , { field: 'HMaterID', title: 'HMaterID', hide: true }
                     , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
-                    , { field: 'HSupplierName', title: '鐗╂枡鍚嶇О' }
+                    , { 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: 'HPURCHASEORGID', hide: true }
-                    , { field: 'HPURCHASEORGIDName', title: '閲囪喘缁勭粐', edit: 'text', event: "HPURCHASEORGID" }
+                    , { field: 'HPURCHASEORGID', title: '閲囪喘缁勭粐', templet: "#HPURCHASEORGIDSub" }
                     , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }//list
                     , { field: 'HFixleadTime', title: '鎻愬墠鏈�', edit: 'text' }
                     , { field: 'HDayPlanBillNo', title: '鏃ヨ鍒掑伐鍗曠紪鍙�', edit: 'text' }
-                    //缂哄皯鏃ヨ鍒掑伐鍗昮id 瀛恑d  鐢熶骇璁㈠崟鍙�  婧愬崟绫诲瀷
+                    , { 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: "HPURCHASEORGID" }
-                    , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, templet: '#HDayPlanDate' }//date
-                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
-                    , { field: 'HRelationQty1 ', title: '鍙敤閲囪喘鏁伴噺', edit: 'text' }
+                    , { 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: 'HSendQty ', 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: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡', edit: 'text', width: 150 }//date
-                    , { field: 'HPOOrderBillDeliveryDate ', title: '閲囪喘璁㈠崟浜よ揣鏃ユ湡', edit: 'text', width: 150 } // date
-                    , { field: 'HPOOrderBillRemark ', title: '閲囪喘璁㈠崟鎽樿', edit: 'text' }
-                    , { field: 'HPOOrderBillNote ', title: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
+                    , { 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' }
                 ]]
             }
@@ -344,11 +371,6 @@
             //#endregion
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //閫夋嫨濮斿缁勭粐鎸夐挳  鏆傛棤
-            form.on('submit(btnHSubORGID)', function () {
-                get_btnHSubORGID();
-            });
 
             //閫夋嫨渚涘簲鍟嗘寜閽�
             form.on('submit(btnHSupplierID)', function () {
@@ -366,39 +388,24 @@
                     , data = checkStatus.data;
                 //鏂板琛岃〃鏍兼暟鎹�
                 var NewRow = {
-                    "HSupplierID": "", "HSupplierNumber": "", "HSupplierName": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
-                    , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
-                    , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+                    "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"];
-
-                        var date = [];
-                        for (var i = 1; i <= option.data.length; i++) {
-                            date.push($('input[name=HDayPlanDate]').eq(i - 1).val())
-                         
-                            //寤惰繜鍘熷洜
-                            $('#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);
-
-                            //鍏抽棴鐘舵��
-                            if (option.data[i - 1].HCloseStatus) {
-                                $('#HCloseStatus' + i + '').attr("checked", true);
-                            }
-                        }
-                        form.render('select');
-                        form.render('checkbox');
                         table.render(option);
 
-                        for (var i = 0; i < date.length; i++) {
-                            $('#HDayPlanDate' + i+1 + '').val(Format(date[i], "yyyy-MM-dd"))
-                        }
+                        //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+                        checkRefresh();
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -415,22 +422,8 @@
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
 
-                            for (var i = 1; i <= option.data.length; i++) {
-                               
-                                //寤惰繜鍘熷洜
-                                $('#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);
-
-                                //鍏抽棴鐘舵��
-                                if (option.data[i - 1].HCloseStatus) {
-                                    $('#HCloseStatus' + i + '').attr("checked", true);
-                                }
-                            }
-                            form.render('select');
-                            form.render('checkbox');
+                            //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+                            checkRefresh();
                         }
                         break;
                 }
@@ -440,6 +433,79 @@
             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
 
             });
 
@@ -505,6 +571,19 @@
                 });
             });
 
+            //琛岄�夋嫨澶勭悊锛堥噰璐粍缁囷級
+            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) {
                 //鑾峰彇閫変腑鐨勫��
@@ -517,8 +596,18 @@
                 });
             });
 
-            //宸ュ崟鐢熶骇鏃ユ湡
-          
+            //鏄惁鎵嬪伐鍏抽棴
+            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 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -526,7 +615,7 @@
             //缁勭粐閫夋嫨椤甸潰
             function get_Organ() {
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
-                var Organization = '';
+                var Organization = '<option  style="color:blue;" value="0">缁勭粐</option>';
                 $.ajax({
                     type: "get",
                     url: GetWEBURL() + "/Web/GetOrganizations",
@@ -537,6 +626,7 @@
                                 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");
@@ -554,6 +644,33 @@
                     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');
             }
 
             //琛屽唴鍒犻櫎
@@ -626,7 +743,7 @@
                         }
                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                         $("#HSettleCurrId").val(checkStatus.data[0].HItemID);
-                        $("#HSettleCurrIdName").val(checkStatus.data[0].甯佸埆);
+                        $("#HSettleCurrIdName").val(checkStatus.data[0].璐у竵鍚嶇О);
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                 })
@@ -636,37 +753,7 @@
             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") {
                             //鎵撳紑鐗╂枡  灏忕獥浣�
@@ -700,6 +787,99 @@
                                 }
                             })
                         }
+
+                        //璁¢噺鍗曚綅
+                        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;
                     }
 
@@ -711,7 +891,7 @@
             {
                 var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
                 $.ajax({
-                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
+                    url: GetWEBURL() + "/Cg_PODemandPlanBill/Cg_PODemandPlanBillList",
                     type: "GET",
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (d) {
@@ -720,17 +900,54 @@
                         form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                             "HBillNo": d.data[0].鍗曟嵁鍙�
                             , "HInterID": d.data[0].hmainid
-                            , "HPRDORGID": d.data[0].缁勭粐
+                            , "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 = [{
-                            "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].琛ㄤ綋澶囨敞
+                            "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');
                     }
                 })
@@ -743,6 +960,11 @@
                 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])
                     }
@@ -752,11 +974,11 @@
                 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",
+                    url: GetWEBURL() + "/Cg_PODemandPlanBill/AddPODemandPlanBillList",
                     async: true,
                     data: { "sMainSub": sMainSub },
                     dataType: "json",
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..2ea5646 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"
@@ -458,7 +458,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"
index 78b7281..4f93be1 100644
--- "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"
@@ -520,9 +520,9 @@
     </script>
 
     <!--澶嶉�夋 閿佸畾鏍囪-->
-    <script type="text/html" id="HLockedSu">
+    <script type="text/html" id="HLockedSub">
         <div class="layui-input-block" style="margin-left: 20px;">
-            <input type="checkbox" name="HLockedSu" lay-filter="HLockedSu" id="HLockedSu{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+            <input type="checkbox" name="HLockedSub" lay-filter="HLockedSub" id="HLockedSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
         </div>
     </script>
 
@@ -629,12 +629,12 @@
                     , { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes"  }//datetime
                     , { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes"}//datetime
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
-                    , { field: 'HDateSub', title: '鎺掍骇鏃ユ湡' }//datetime
+                    , { 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: '#HLockedSu' }//check
+                    , { field: 'HLockedSub', title: '閿佸畾鏍囪', templet: '#HLockedSub' }//check
                     , { field: 'HComplete', title: '鏄惁榻愬', edit: 'text' }
                     , { field: 'HStatusTag', title: '鐘舵�佹爣璁�', templet: '#HStatusTag' }//check
                     , { field: 'HIsHandModify', title: '鎵嬪伐淇敼鏍囪', templet: '#HIsHandModify' }//check
@@ -803,6 +803,23 @@
                         }
                     });
                 }
+                
+                //鎺掍骇鏃ユ湡
+                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') {
@@ -827,13 +844,13 @@
 
             //#region 澶嶉�夋
             //閿佸畾鏍囪
-            form.on('checkbox(HLockedSu)', function (data) {
+            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.HLockedSu = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                        value.HLockedSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
                     }
                 });
             });
@@ -1123,11 +1140,10 @@
             //澶氶��  鍒锋柊琛ㄦ牸
             function checkRefresh() {
                 for (var i = 1; i <= option.data.length; i++) {
-                    //$('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
 
                     //閿佸畾鏍囪
-                    if (option.data[i - 1].HLockedSu) {
-                        $('#HLockedSu' + i + '').attr("checked", true);
+                    if (option.data[i - 1].HLockedSub) {
+                        $('#HLockedSub' + i + '').attr("checked", true);
                     }
                     //鐘舵�佹爣璁�
                     if (option.data[i - 1].HStatusTag) {
@@ -1295,15 +1311,36 @@
 
                         //瀛愯〃  璧嬪��
                         var rowdata = [{
-                            "HMasterDate": d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�, "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
-                            ,"HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": d.data[0].寮�濮嬫椂闂�, "HETimes": d.data[0].缁撴潫鏃堕棿,
-                            "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": d.data[0].鎺掍骇鏃ユ湡, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": d.data[0].瀛愬叧闂椂闂�
-                            , "HCloseTypeSub": false, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": false, "HComplete": d.data[0].鏄惁榻愬
-                            ,"HStatusTag": false, "HIsHandModify": false
+                            "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);
-                        form.render('select');
+
+                        //鏄惁鎵嬪伐鍏抽棴
+                        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');
                     }
                 })
             }
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"
index c03ba5e..89dc3c5 100644
--- "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"
@@ -61,7 +61,7 @@
                                 <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_DeleteBill"><i class="layui-icon layui-icon-logout"></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>
@@ -118,7 +118,7 @@
                 case 'set_DeleteBill': set_DeleteBill();
                     break;
                 //鍏抽棴
-                case 'set_DeleteBill': set_CloseBill();
+                case 'set_CloseBill': set_CloseBill();
                     break;
             };
         });
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..125a5a8
--- /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,10 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+
+</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"
index 750bd74..a259375 100644
--- "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"
@@ -61,7 +61,7 @@
                                 <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_DeleteBill"><i class="layui-icon layui-icon-logout"></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>
@@ -118,7 +118,7 @@
                 case 'set_DeleteBill': set_DeleteBill();
                     break;
                 //鍏抽棴
-                case 'set_DeleteBill': set_CloseBill();
+                case 'set_CloseBill': set_CloseBill();
                     break;
             };
         });
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 e72cacc..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"
@@ -1359,7 +1359,7 @@
                         }];
                         option.data = rowdata;
                         table.render(option);
-
+                      
                         if (d.data[0].濮斿鏍囪) {
                             $('#HSupFlag1').attr("checked", true);
                         }

--
Gitblit v1.9.1