From 8775b5abf0d1ca368cfd1ceba8f5c364bb87f2f5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 29 十一月 2022 10:03:29 +0800
Subject: [PATCH] 1

---
 WebTM/views/Baseset/基础资料/OtherOutRequestBillList.html            |  238 ++
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Check_New.html              |    2 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user                |  127 
 WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html                  |  652 ++++--
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html                |    2 
 WebTM/views/Baseset/基础资料/Gy_DormList.html                        |    2 
 WebTM/views/质量管理/来料检验单/Kf_QCStockInCheckBill_Fast.html           |   10 
 WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html          |  844 +++++++++
 WebTM/views/基础资料/公用基础资料/Add_Edit_Xt_ORGANIZATIONSList.html       |    9 
 WebTM/views/home/console_Mobile.html                             |    6 
 WebTM/views/index.html                                           |    1 
 WebTM/views/Baseset/基础资料/Gy_WorkTypeList.html                    |    2 
 WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html               |    2 
 WebTM/views/Baseset/基础资料/Gy_ClassTimePrjList.html                |    2 
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html                 |    4 
 WebTM/views/Baseset/基础资料/Gy_PostList.html                        |    2 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html                  |    2 
 WebTM/views/领料发货/生产补料/Kf_MateReplenishOutBill_Check_New.html     |  722 ++++---
 WebTM/views/Baseset/基础资料/Gy_EmployeeList.html                    |    2 
 WebTM/views/Baseset/基础资料/Gy_WarehouseListNew.html                |    3 
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html                 |  824 +++++----
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html                    |    9 
 WebTM/views/质量管理/来料检验单/Kf_SCStockInCheckBill_Fast.html           | 1250 ++++++++++++++
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html               |    2 
 WebTM/views/领料发货/生产补料/Kf_MateReplenishOutBill_CheckList_New.html |  494 +++++
 WebTM/views/PublicPage/GroupInformation.html                     |   45 
 WebTM/views/Baseset/基础资料/Gy_DutyList.html                        |    2 
 WebTM/layuiadmin/Scripts/webConfig.js                            |    3 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html              |    2 
 WebTM/WebTM.csproj                                               |    3 
 30 files changed, 4,186 insertions(+), 1,082 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 74c1583..b07cc62 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>True|2022-11-22T12:57:02.2964544Z;True|2022-11-22T20:38:43.5184419+08:00;True|2022-11-22T13:51:29.1879298+08:00;True|2022-11-22T13:51:05.9489263+08:00;True|2022-11-22T13:38:01.0719076+08:00;True|2022-11-22T13:30:22.2908977+08:00;True|2022-11-18T16:47:27.4886314+08:00;True|2022-11-18T14:43:02.5982310+08:00;True|2022-11-16T20:16:00.9104448+08:00;True|2022-11-16T20:11:19.4807083+08:00;True|2022-11-16T16:57:13.9042012+08:00;True|2022-11-16T16:46:44.0991343+08:00;True|2022-11-16T16:37:19.0406103+08:00;True|2022-11-16T16:19:38.4156261+08:00;True|2022-11-16T16:16:04.9357078+08:00;True|2022-11-16T16:04:29.0981277+08:00;True|2022-11-07T00:11:01.0022062+08:00;True|2022-11-07T00:09:31.8325304+08:00;True|2022-11-07T00:06:25.4979105+08:00;True|2022-11-07T00:05:24.0128128+08:00;True|2022-11-07T00:02:26.6792917+08:00;True|2022-11-07T00:02:07.7671121+08:00;True|2022-11-06T23:58:11.3413300+08:00;True|2022-11-06T23:56:11.6286341+08:00;True|2022-11-06T23:54:57.9713190+08:00;True|2022-11-06T23:52:32.4429994+08:00;True|2022-11-06T23:51:06.4175914+08:00;True|2022-11-06T23:49:52.5557919+08:00;True|2022-11-06T23:47:25.1764937+08:00;True|2022-11-06T23:24:08.0785351+08:00;True|2022-11-06T23:22:03.7439204+08:00;True|2022-11-06T23:20:00.2289162+08:00;True|2022-11-06T23:18:55.7287420+08:00;True|2022-11-06T23:17:13.8177388+08:00;True|2022-11-06T23:16:22.9839714+08:00;True|2022-11-06T23:14:39.0422764+08:00;True|2022-11-06T23:11:40.2239132+08:00;True|2022-11-06T23:01:29.5083665+08:00;True|2022-11-06T23:00:53.6963635+08:00;True|2022-11-06T22:59:51.4246351+08:00;True|2022-11-06T22:57:50.3226878+08:00;True|2022-11-06T22:54:47.4900860+08:00;True|2022-11-06T22:53:15.7434540+08:00;True|2022-11-06T22:52:33.5018758+08:00;True|2022-11-06T22:51:37.4497891+08:00;True|2022-11-06T22:50:29.9658014+08:00;True|2022-11-06T22:47:13.6003785+08:00;True|2022-11-06T22:45:55.6965741+08:00;True|2022-11-06T22:42:15.5166921+08:00;True|2022-11-06T22:41:22.2314122+08:00;True|2022-11-06T22:40:45.8688562+08:00;True|2022-11-06T22:40:05.5540223+08:00;True|2022-11-06T22:38:04.6800826+08:00;True|2022-11-06T22:36:26.8903126+08:00;True|2022-11-06T22:28:50.1569466+08:00;True|2022-11-06T22:24:24.8450157+08:00;True|2022-11-06T22:22:42.8380587+08:00;True|2022-11-06T22:20:33.2909423+08:00;True|2022-11-06T22:17:55.6322289+08:00;True|2022-11-06T22:16:02.1725875+08:00;True|2022-11-06T22:14:56.2399452+08:00;True|2022-11-06T22:11:20.6258450+08:00;True|2022-11-06T21:39:55.0834387+08:00;True|2022-11-06T21:24:07.2677181+08:00;True|2022-11-06T21:22:32.4372436+08:00;True|2022-11-06T21:21:21.8242808+08:00;True|2022-11-06T21:20:50.5922166+08:00;True|2022-11-06T21:18:02.4445054+08:00;True|2022-11-06T21:15:41.3737211+08:00;True|2022-11-06T21:15:23.0607120+08:00;True|2022-11-06T21:09:09.6026319+08:00;True|2022-11-06T21:05:54.5433653+08:00;True|2022-11-06T21:05:05.1794341+08:00;True|2022-11-06T21:04:35.1035978+08:00;True|2022-11-06T21:03:20.2389996+08:00;True|2022-11-06T21:02:16.6261441+08:00;True|2022-11-06T20:59:54.1997768+08:00;True|2022-11-06T20:59:25.6586877+08:00;True|2022-11-06T20:59:01.9535660+08:00;True|2022-11-06T20:57:04.4434720+08:00;True|2022-11-06T20:48:01.4587772+08:00;True|2022-11-06T20:47:42.8328288+08:00;True|2022-11-06T20:47:22.6138834+08:00;True|2022-11-06T20:45:37.6953074+08:00;True|2022-11-06T20:43:59.9297691+08:00;True|2022-11-06T20:40:27.3134811+08:00;True|2022-11-06T20:39:10.9109046+08:00;True|2022-11-06T20:38:32.0656489+08:00;True|2022-11-06T20:37:30.1638511+08:00;True|2022-11-06T20:32:59.7205048+08:00;True|2022-11-04T17:16:05.7419249+08:00;True|2022-11-04T17:15:31.0425173+08:00;True|2022-11-04T17:07:38.3581110+08:00;True|2022-11-04T17:07:12.1626517+08:00;True|2022-11-04T17:06:41.4748460+08:00;True|2022-11-04T17:01:55.1542465+08:00;True|2022-11-04T16:57:30.0789538+08:00;True|2022-11-04T16:48:42.3331909+08:00;True|2022-11-04T16:47:54.9363158+08:00;True|2022-11-04T16:34:25.1608306+08:00;True|2022-11-04T16:34:05.2612149+08:00;True|2022-11-04T16:01:44.6861859+08:00;True|2022-11-04T15:57:41.9143744+08:00;True|2022-11-04T15:56:07.8404679+08:00;True|2022-11-04T15:47:53.3443162+08:00;True|2022-11-04T15:36:39.4424290+08:00;True|2022-11-04T15:35:20.1484792+08:00;True|2022-11-04T15:33:03.2201293+08:00;True|2022-11-04T15:28:49.8690484+08:00;True|2022-11-04T15:28:19.2314864+08:00;True|2022-11-04T15:25:58.5731227+08:00;True|2022-11-04T15:25:27.8755079+08:00;True|2022-11-04T15:23:36.6120285+08:00;True|2022-11-04T15:21:31.3420344+08:00;True|2022-11-04T15:21:14.6592668+08:00;True|2022-11-04T15:20:56.2465403+08:00;True|2022-11-04T15:20:15.8930937+08:00;True|2022-11-04T15:19:17.7528547+08:00;True|2022-11-04T15:18:23.5955076+08:00;True|2022-11-04T15:14:21.0858315+08:00;True|2022-11-04T15:06:42.8088023+08:00;True|2022-11-04T15:05:35.1788684+08:00;True|2022-11-04T15:02:42.8758239+08:00;True|2022-11-04T15:01:57.5968687+08:00;True|2022-11-04T15:01:27.4523012+08:00;True|2022-11-04T15:01:06.3867535+08:00;True|2022-11-04T15:00:46.6202709+08:00;True|2022-11-04T15:00:26.5448800+08:00;True|2022-11-04T15:00:02.5522605+08:00;True|2022-11-04T14:59:16.7492747+08:00;True|2022-11-04T14:58:30.8358796+08:00;True|2022-11-04T14:58:04.5157418+08:00;True|2022-11-04T14:56:28.3222498+08:00;True|2022-11-04T14:53:55.4282929+08:00;True|2022-11-04T14:38:08.8607315+08:00;True|2022-11-04T14:36:57.9054167+08:00;True|2022-11-04T14:32:33.1953337+08:00;True|2022-11-04T14:29:45.6053971+08:00;True|2022-11-04T14:26:10.7088759+08:00;True|2022-11-04T14:20:11.5550052+08:00;True|2022-11-04T14:09:55.4914871+08:00;True|2022-11-04T14:08:13.9781669+08:00;True|2022-11-04T14:05:55.9684715+08:00;True|2022-11-04T14:02:31.6815309+08:00;True|2022-11-04T11:33:40.4684952+08:00;True|2022-11-04T11:32:29.4394464+08:00;True|2022-11-04T11:31:27.0585751+08:00;True|2022-11-04T11:17:24.8001745+08:00;True|2022-11-04T10:18:45.5943976+08:00;True|2022-11-04T10:17:59.4067621+08:00;True|2022-11-04T10:08:19.0043776+08:00;True|2022-11-04T10:05:14.0678303+08:00;True|2022-11-04T10:04:17.6584589+08:00;True|2022-11-04T10:00:12.3564632+08:00;True|2022-11-04T09:58:09.8045020+08:00;True|2022-11-04T09:57:18.0742428+08:00;True|2022-11-04T09:46:40.4989929+08:00;True|2022-11-04T09:44:29.4740744+08:00;True|2022-11-04T09:40:08.8824983+08:00;True|2022-11-04T09:39:16.7759248+08:00;True|2022-11-04T09:36:25.8271389+08:00;True|2022-11-04T09:35:27.7887610+08:00;True|2022-11-04T09:32:50.0572867+08:00;True|2022-11-04T09:30:27.5167728+08:00;True|2022-11-04T08:28:28.7622871+08:00;True|2022-11-04T00:41:49.1309755+08:00;True|2022-11-04T00:26:55.4920728+08:00;True|2022-11-04T00:22:01.7915908+08:00;True|2022-11-04T00:20:25.8839292+08:00;True|2022-11-04T00:19:36.1178115+08:00;True|2022-11-03T22:30:24.0630642+08:00;True|2022-11-03T22:29:48.8822001+08:00;True|2022-11-03T22:28:39.4945416+08:00;True|2022-11-03T22:22:05.1296769+08:00;True|2022-11-03T22:20:01.9154172+08:00;True|2022-11-03T22:12:47.0912314+08:00;True|2022-11-03T22:09:51.6008375+08:00;True|2022-11-03T22:08:19.8051794+08:00;True|2022-11-03T22:02:37.8131329+08:00;True|2022-11-03T22:01:59.8171139+08:00;True|2022-11-03T22:01:12.8921261+08:00;True|2022-11-03T21:58:04.3881404+08:00;True|2022-11-03T21:56:34.0258019+08:00;True|2022-11-03T21:49:08.3433049+08:00;True|2022-11-03T21:47:42.8047403+08:00;True|2022-11-03T17:44:06.0546647+08:00;True|2022-11-03T17:42:29.4844080+08:00;True|2022-11-03T17:40:31.0155249+08:00;True|2022-11-03T17:31:12.8261511+08:00;True|2022-11-03T17:30:46.5156389+08:00;True|2022-11-03T17:30:18.4004466+08:00;True|2022-11-03T17:29:19.2711984+08:00;True|2022-11-03T17:24:56.0912325+08:00;True|2022-11-03T17:23:00.5463265+08:00;True|2022-11-03T17:22:01.9297589+08:00;True|2022-11-03T17:13:25.4542049+08:00;True|2022-11-03T17:12:53.7502815+08:00;True|2022-11-03T17:09:52.5458393+08:00;True|2022-11-03T17:07:01.0548611+08:00;True|2022-11-03T17:05:20.6638108+08:00;True|2022-11-03T16:33:01.5185760+08:00;True|2022-11-03T16:19:14.9272415+08:00;True|2022-11-03T16:17:36.2529819+08:00;True|2022-11-03T16:13:29.9858980+08:00;True|2022-11-03T16:06:11.4462234+08:00;True|2022-11-03T16:02:48.4670667+08:00;True|2022-11-03T16:01:56.0060862+08:00;True|2022-11-03T15:58:30.5958027+08:00;True|2022-11-03T15:56:05.1001674+08:00;True|2022-11-03T15:42:14.4100003+08:00;True|2022-11-03T15:41:54.5236682+08:00;True|2022-11-03T15:33:56.9550219+08:00;True|2022-11-03T15:31:53.5459229+08:00;True|2022-11-03T15:29:52.0292825+08:00;True|2022-11-03T15:29:26.8006363+08:00;True|2022-11-03T15:28:42.3599187+08:00;True|2022-11-03T15:27:05.8638897+08:00;True|2022-11-03T15:26:21.8683662+08:00;True|2022-11-03T15:22:02.5546983+08:00;True|2022-11-03T15:20:18.4083041+08:00;True|2022-11-03T15:18:21.3166314+08:00;True|2022-11-03T15:15:35.3547054+08:00;True|2022-11-03T15:14:45.7066271+08:00;True|2022-11-03T15:14:18.6680750+08:00;True|2022-11-03T15:13:17.4086063+08:00;True|2022-11-03T15:12:49.1551614+08:00;True|2022-11-03T15:09:54.2966404+08:00;True|2022-11-03T15:08:33.2643354+08:00;True|2022-11-03T15:03:48.4677065+08:00;True|2022-11-03T15:03:20.6766386+08:00;True|2022-11-03T15:02:25.4759343+08:00;True|2022-11-03T15:01:43.3949160+08:00;True|2022-11-03T14:59:36.7755914+08:00;True|2022-11-03T14:59:08.3032217+08:00;True|2022-11-03T14:54:05.7546420+08:00;True|2022-11-03T14:53:12.5285933+08:00;True|2022-11-03T14:48:35.9447335+08:00;True|2022-11-03T14:44:04.9920640+08:00;True|2022-11-03T14:39:55.1850754+08:00;True|2022-11-03T14:34:44.6106265+08:00;True|2022-11-03T14:34:11.2891151+08:00;True|2022-11-03T14:33:28.3522973+08:00;True|2022-11-03T14:30:32.2859923+08:00;True|2022-11-03T14:29:49.2885812+08:00;True|2022-11-03T14:27:09.6099674+08:00;True|2022-11-03T14:22:35.6088773+08:00;True|2022-11-03T14:19:02.1393788+08:00;True|2022-11-03T14:13:07.2753590+08:00;True|2022-11-03T13:25:48.9286083+08:00;True|2022-11-03T13:24:20.3673861+08:00;True|2022-11-03T11:34:28.3126472+08:00;True|2022-11-03T11:25:23.5007075+08:00;True|2022-11-03T11:09:26.2340839+08:00;True|2022-11-03T11:07:13.9141127+08:00;True|2022-11-03T11:06:43.5970449+08:00;True|2022-11-03T11:05:01.8003653+08:00;True|2022-09-21T00:24:42.4485117+08:00;True|2022-09-21T00:23:30.6165996+08:00;True|2022-09-21T00:21:54.0769223+08:00;True|2022-09-21T00:21:11.2674898+08:00;True|2022-09-21T00:17:52.6509285+08:00;True|2022-09-21T00:15:38.6038978+08:00;True|2022-09-21T00:14:54.7621848+08:00;True|2022-09-21T00:11:51.5120522+08:00;True|2022-09-21T00:11:09.6108434+08:00;True|2022-09-21T00:07:17.7642560+08:00;True|2022-09-21T00:06:18.2299285+08:00;True|2022-09-21T00:02:45.7037170+08:00;True|2022-09-20T23:59:19.3350238+08:00;True|2022-09-20T23:56:46.9651144+08:00;True|2022-09-20T23:54:12.3823374+08:00;True|2022-09-20T23:53:15.0925458+08:00;True|2022-09-20T23:49:36.1374365+08:00;True|2022-09-20T23:48:54.3758405+08:00;True|2022-09-20T23:47:39.0472308+08:00;True|2022-09-20T23:42:54.1215607+08:00;True|2022-09-20T23:40:15.7725224+08:00;True|2022-09-20T23:37:14.7037503+08:00;True|2022-09-20T23:35:19.1982323+08:00;True|2022-09-20T23:34:31.1566961+08:00;True|2022-09-20T23:28:48.6099271+08:00;True|2022-09-20T19:45:29.9390200+08:00;True|2022-09-20T19:44:19.1113026+08:00;True|2022-09-20T19:40:24.1980933+08:00;True|2022-09-20T18:58:46.4824143+08:00;True|2022-09-20T18:57:21.9534366+08:00;True|2022-09-20T18:56:42.9309370+08:00;True|2022-09-20T18:54:52.6889849+08:00;True|2022-09-20T18:53:31.8030276+08:00;True|2022-09-20T18:53:00.2573323+08:00;True|2022-09-20T18:49:46.0480599+08:00;True|2022-09-20T18:49:15.4245121+08:00;True|2022-09-20T18:47:46.6323413+08:00;True|2022-09-20T18:47:23.6189860+08:00;True|2022-09-20T18:33:04.6766413+08:00;True|2022-09-20T18:32:43.0581554+08:00;True|2022-09-20T18:29:15.1323389+08:00;True|2022-09-20T18:26:24.4735929+08:00;True|2022-09-20T18:22:58.6560001+08:00;True|2022-09-20T18:19:37.1345950+08:00;True|2022-09-20T18:14:12.1501278+08:00;True|2022-09-20T18:10:26.5141290+08:00;True|2022-09-20T14:10:02.2009114+08:00;True|2022-09-20T14:09:18.7490338+08:00;True|2022-09-20T14:06:07.1071862+08:00;True|2022-09-20T14:05:36.7602842+08:00;True|2022-09-20T14:05:06.4981580+08:00;True|2022-09-20T13:55:02.6977754+08:00;True|2022-09-20T13:54:33.9625686+08:00;True|2022-09-20T13:53:30.0074842+08:00;True|2022-09-20T13:50:53.6752731+08:00;True|2022-09-20T13:50:40.0825979+08:00;True|2022-09-20T13:50:08.3533920+08:00;True|2022-09-20T13:47:59.8029351+08:00;True|2022-09-20T13:47:16.2233986+08:00;True|2022-09-20T13:45:34.8991820+08:00;True|2022-09-20T13:43:06.3282277+08:00;True|2022-09-20T13:42:49.3974738+08:00;True|2022-09-20T13:41:52.4576423+08:00;True|2022-09-20T13:39:45.2665520+08:00;True|2022-09-20T13:37:11.9786744+08:00;True|2022-09-20T13:35:59.7951042+08:00;True|2022-09-20T13:21:24.7591933+08:00;True|2022-09-20T13:19:08.4384006+08:00;True|2022-09-20T13:17:44.6880505+08:00;True|2022-09-20T13:17:23.6699248+08:00;True|2022-09-20T11:37:48.6978366+08:00;True|2022-09-20T11:28:51.6591514+08:00;True|2022-09-20T11:26:35.5353930+08:00;True|2022-09-20T11:21:16.9312199+08:00;True|2022-09-20T11:12:54.7028539+08:00;True|2022-09-20T11:10:58.6925584+08:00;True|2022-09-20T11:07:07.1581858+08:00;True|2022-09-20T11:06:00.0552909+08:00;True|2022-09-20T11:04:58.3262758+08:00;True|2022-09-20T10:30:01.3491236+08:00;True|2022-09-20T10:27:55.6155047+08:00;True|2022-09-20T10:24:34.6450658+08:00;True|2022-09-19T23:30:53.7584842+08:00;True|2022-09-19T22:47:14.7408779+08:00;True|2022-09-19T22:17:14.4843402+08:00;True|2022-09-19T22:16:17.9460099+08:00;True|2022-09-19T19:56:08.2171887+08:00;True|2022-09-19T19:55:32.9843461+08:00;True|2022-09-19T19:47:35.1616545+08:00;True|2022-09-19T19:42:07.8274340+08:00;True|2022-09-19T19:36:57.0678726+08:00;True|2022-09-19T19:27:08.7570956+08:00;True|2022-09-19T18:47:11.9251708+08:00;True|2022-09-19T18:32:41.9046960+08:00;True|2022-09-19T18:32:11.2964953+08:00;True|2022-09-19T18:31:01.8241547+08:00;True|2022-09-19T18:30:08.3809783+08:00;True|2022-09-19T18:28:30.9383874+08:00;True|2022-09-19T18:28:00.4089752+08:00;True|2022-09-19T18:26:31.7588875+08:00;True|2022-09-19T18:23:37.1844263+08:00;True|2022-09-19T18:19:23.5223220+08:00;True|2022-09-19T18:16:24.3671030+08:00;True|2022-09-19T18:15:42.3314404+08:00;True|2022-09-19T18:14:58.3459891+08:00;True|2022-09-19T18:13:11.8126928+08:00;True|2022-09-19T18:12:05.3523035+08:00;True|2022-09-19T18:09:38.8508196+08:00;True|2022-09-19T18:06:18.8343501+08:00;True|2022-09-19T18:04:24.6365367+08:00;True|2022-09-19T18:04:02.7161180+08:00;True|2022-09-19T17:52:39.7243696+08:00;True|2022-09-19T17:48:02.8812149+08:00;True|2022-09-19T17:45:35.2966258+08:00;True|2022-09-19T17:45:10.3682448+08:00;True|2022-09-19T17:28:06.4075409+08:00;True|2022-09-19T17:27:05.5352183+08:00;True|2022-09-19T17:25:49.0446351+08:00;True|2022-09-19T17:19:56.8408764+08:00;True|2022-09-19T17:15:11.2854975+08:00;True|2022-09-19T17:10:09.9797179+08:00;True|2022-09-19T17:05:23.9082254+08:00;True|2022-09-19T16:49:34.8166120+08:00;True|2022-09-19T16:48:32.6138453+08:00;True|2022-09-19T16:11:09.7720374+08:00;True|2022-09-19T16:06:49.6910257+08:00;True|2022-09-19T15:48:55.0951009+08:00;True|2022-09-19T15:44:09.3805562+08:00;True|2022-09-19T15:37:00.7111476+08:00;True|2022-09-19T15:32:58.6290979+08:00;True|2022-09-19T15:19:30.0278345+08:00;True|2022-09-19T14:52:21.8632856+08:00;True|2022-09-19T14:38:46.4553306+08:00;True|2022-09-19T13:42:01.4506384+08:00;True|2022-09-19T12:58:28.9049920+08:00;True|2022-09-19T12:54:59.4516607+08:00;True|2022-09-19T12:53:31.5725119+08:00;True|2022-09-19T12:52:22.3794262+08:00;True|2022-09-19T12:51:19.9303172+08:00;True|2022-09-19T11:33:05.9759430+08:00;True|2022-09-19T11:22:45.6218002+08:00;True|2022-09-19T11:21:44.6218188+08:00;True|2022-09-19T11:18:19.6585697+08:00;True|2022-09-19T10:01:42.8751827+08:00;True|2022-09-19T09:59:27.6894579+08:00;True|2022-09-19T09:58:29.7812140+08:00;True|2022-09-19T09:57:35.1691613+08:00;True|2022-09-19T09:54:54.0826547+08:00;True|2022-09-19T09:53:33.8031967+08:00;True|2022-09-19T09:52:06.4097498+08:00;True|2022-09-19T09:49:23.0812347+08:00;True|2022-09-19T09:48:08.4656403+08:00;True|2022-09-19T09:41:43.8664570+08:00;True|2022-09-19T09:38:54.9598501+08:00;True|2022-09-19T09:31:13.2756714+08:00;True|2022-09-19T09:28:35.3347576+08:00;True|2022-09-19T09:28:16.1346235+08:00;True|2022-09-19T09:22:21.9158555+08:00;True|2022-09-19T09:19:53.2457860+08:00;True|2022-09-19T09:17:40.4767786+08:00;True|2022-09-19T09:12:52.3269838+08:00;True|2022-09-19T09:06:28.3404743+08:00;True|2022-09-16T14:39:46.1538149+08:00;True|2022-09-16T14:38:39.3325490+08:00;True|2022-09-16T14:37:28.6292760+08:00;True|2022-09-16T14:36:03.7325060+08:00;True|2022-09-16T14:24:03.7985017+08:00;True|2022-09-16T13:45:49.3535299+08:00;True|2022-09-16T13:41:57.3640518+08:00;True|2022-09-16T13:37:27.9575800+08:00;True|2022-09-16T13:07:39.5706914+08:00;True|2022-09-16T12:35:11.7621908+08:00;True|2022-09-16T12:31:39.2441241+08:00;True|2022-09-16T12:28:55.9457285+08:00;True|2022-09-16T11:31:23.6502800+08:00;True|2022-09-16T09:33:20.6715202+08:00;True|2022-09-16T09:10:35.5505705+08:00;True|2022-09-16T08:35:28.2496647+08:00;True|2022-09-16T00:24:45.7514509+08:00;True|2022-09-15T22:26:32.1774985+08:00;True|2022-09-15T22:13:21.4580735+08:00;True|2022-09-15T22:10:12.6638634+08:00;True|2022-09-15T22:06:52.3231872+08:00;True|2022-09-15T22:03:48.1232035+08:00;True|2022-09-15T21:56:19.4587246+08:00;True|2022-09-15T21:50:38.6051186+08:00;True|2022-09-15T21:46:09.3054239+08:00;True|2022-09-15T21:45:15.8817395+08:00;True|2022-09-15T21:43:15.9624978+08:00;True|2022-09-15T21:38:59.2924283+08:00;True|2022-09-15T21:38:21.6340686+08:00;True|2022-09-15T21:36:02.8290156+08:00;True|2022-09-15T21:35:02.7056919+08:00;True|2022-09-15T21:34:19.6891136+08:00;True|2022-09-15T21:31:11.3145325+08:00;True|2022-09-15T21:28:32.6724932+08:00;True|2022-09-15T21:27:40.1468647+08:00;True|2022-09-15T21:25:54.4154279+08:00;True|2022-09-15T21:19:36.4265440+08:00;True|2022-09-15T21:15:06.1954350+08:00;True|2022-09-15T21:12:02.1375641+08:00;True|2022-09-15T21:11:17.0507035+08:00;True|2022-09-15T21:10:19.5589695+08:00;True|2022-09-15T21:09:21.0837046+08:00;True|2022-09-15T21:08:23.0829740+08:00;True|2022-09-15T21:07:23.0373422+08:00;True|2022-09-15T18:03:10.6944516+08:00;True|2022-09-15T18:00:59.8420469+08:00;True|2022-09-15T18:00:16.7451463+08:00;True|2022-09-15T17:58:04.6820715+08:00;True|2022-09-15T17:56:08.2796295+08:00;True|2022-09-15T17:50:21.3996440+08:00;True|2022-09-15T17:09:03.4466699+08:00;True|2022-09-15T17:05:00.6245961+08:00;True|2022-09-15T17:00:29.9220310+08:00;True|2022-09-15T16:55:51.9658511+08:00;True|2022-09-15T16:42:52.9815324+08:00;True|2022-09-15T16:37:08.8417108+08:00;True|2022-09-15T16:35:56.8700509+08:00;True|2022-09-15T16:29:30.7469398+08:00;True|2022-09-15T16:28:08.7490741+08:00;True|2022-09-15T16:26:06.9984448+08:00;True|2022-09-15T16:20:58.5626601+08:00;True|2022-09-15T16:13:51.8350616+08:00;True|2022-09-15T16:10:45.2646587+08:00;True|2022-09-15T16:04:50.7032017+08:00;True|2022-09-15T16:03:20.6149583+08:00;True|2022-09-15T16:01:46.9991407+08:00;True|2022-09-15T15:59:04.7876393+08:00;True|2022-09-15T15:49:56.0560711+08:00;True|2022-09-15T15:46:30.2125881+08:00;True|2022-09-15T15:44:33.2232339+08:00;True|2022-09-15T15:41:53.8571301+08:00;True|2022-09-15T15:39:41.1657391+08:00;True|2022-09-15T15:36:16.7669816+08:00;True|2022-09-15T15:31:09.9099918+08:00;True|2022-09-15T15:28:59.7558234+08:00;True|2022-09-15T15:27:48.2279743+08:00;True|2022-09-15T15:25:50.9593671+08:00;True|2022-09-15T15:18:46.2144526+08:00;True|2022-09-15T15:10:53.9713944+08:00;True|2022-09-15T15:08:13.2429308+08:00;True|2022-09-15T14:58:40.9148959+08:00;True|2022-09-15T14:41:20.0399075+08:00;True|2022-09-15T14:33:11.8106454+08:00;True|2022-08-13T17:30:30.8881784+08:00;True|2022-08-11T21:31:04.7242868+08:00;True|2022-08-09T20:40:34.4220320+08:00;True|2022-08-08T14:31:56.5315323+08:00;True|2022-08-03T18:44:00.0395786+08:00;True|2022-07-12T13:58:49.8900918+08:00;True|2022-07-01T09:09:47.0947686+08:00;True|2022-06-30T12:28:33.5694934+08:00;True|2022-06-14T11:19:56.5428784+08:00;True|2022-06-10T13:43:02.7010531+08:00;True|2022-05-13T14:56:55.6031908+08:00;True|2022-04-22T17:26:31.1780137+08:00;True|2022-04-19T16:20:09.8422169+08:00;False|2022-04-12T15:13:02.1028573+08:00;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+    <History>True|2022-11-28T07:16:44.9403230Z;True|2022-11-28T14:56:47.7637239+08:00;True|2022-11-28T14:49:44.3721129+08:00;True|2022-11-28T14:38:00.4815157+08:00;True|2022-11-28T14:33:24.5600299+08:00;True|2022-11-28T14:31:02.9640321+08:00;True|2022-11-28T14:17:34.1609070+08:00;True|2022-11-28T14:07:40.4881064+08:00;True|2022-11-28T13:49:21.7088604+08:00;True|2022-11-28T11:02:47.3377586+08:00;True|2022-11-28T10:55:57.2447372+08:00;True|2022-11-28T10:29:18.1917235+08:00;True|2022-11-28T10:22:21.5532388+08:00;True|2022-11-28T10:16:22.5580911+08:00;True|2022-11-28T10:11:12.7963443+08:00;True|2022-11-28T10:06:51.6353151+08:00;True|2022-11-28T09:43:52.1950597+08:00;True|2022-11-28T09:19:17.2060227+08:00;True|2022-11-28T08:47:56.4777677+08:00;True|2022-11-27T21:24:17.8761408+08:00;True|2022-11-27T21:21:57.0614332+08:00;True|2022-11-27T21:07:38.7308609+08:00;True|2022-11-27T21:00:09.6597159+08:00;True|2022-11-27T20:47:37.8957069+08:00;True|2022-11-27T20:30:44.4635893+08:00;True|2022-11-27T20:12:37.0266505+08:00;True|2022-11-27T20:05:52.8710869+08:00;True|2022-11-27T19:58:01.4178500+08:00;True|2022-11-27T19:51:48.9876431+08:00;True|2022-11-27T15:47:48.0077064+08:00;True|2022-11-27T15:41:50.4064476+08:00;True|2022-11-27T14:57:52.6509781+08:00;True|2022-11-27T13:49:32.0448044+08:00;True|2022-11-26T20:58:04.1530048+08:00;True|2022-11-26T20:56:27.6550050+08:00;True|2022-11-26T20:41:51.3374821+08:00;True|2022-11-26T20:25:06.3090917+08:00;True|2022-11-26T20:19:09.5822558+08:00;True|2022-11-26T20:00:33.9733431+08:00;True|2022-11-26T19:42:17.5440048+08:00;True|2022-11-26T18:32:38.7807091+08:00;True|2022-11-26T18:27:23.3947307+08:00;True|2022-11-26T17:49:20.5791271+08:00;True|2022-11-26T11:58:31.3225645+08:00;True|2022-11-26T11:56:00.8785667+08:00;True|2022-11-26T09:29:41.4883731+08:00;True|2022-11-26T09:26:53.2391101+08:00;True|2022-11-26T08:53:11.7949296+08:00;True|2022-11-25T14:46:17.1261696+08:00;True|2022-11-25T14:10:30.0326971+08:00;True|2022-11-25T13:43:07.8042256+08:00;True|2022-11-25T13:39:11.2576035+08:00;True|2022-11-25T12:57:47.8911852+08:00;True|2022-11-25T11:09:04.1721320+08:00;True|2022-11-25T10:18:05.0179889+08:00;True|2022-11-25T10:16:47.8019601+08:00;True|2022-11-25T10:08:50.1605346+08:00;True|2022-11-25T09:20:39.7852344+08:00;True|2022-11-25T09:16:50.2909302+08:00;True|2022-11-25T09:13:55.3778365+08:00;True|2022-11-25T09:04:36.5498525+08:00;True|2022-11-25T08:57:43.2313995+08:00;True|2022-11-24T20:44:00.1096442+08:00;True|2022-11-24T20:39:45.2156414+08:00;True|2022-11-24T14:45:59.2209494+08:00;True|2022-11-24T14:28:35.3129315+08:00;True|2022-11-24T13:37:30.1576050+08:00;True|2022-11-24T10:17:49.6643350+08:00;True|2022-11-24T09:51:32.5895980+08:00;True|2022-11-24T09:37:40.7120182+08:00;True|2022-11-24T09:30:41.8904169+08:00;True|2022-11-24T08:57:56.1095804+08:00;True|2022-11-22T20:57:02.2964544+08:00;True|2022-11-22T20:38:43.5184419+08:00;True|2022-11-22T13:51:29.1879298+08:00;True|2022-11-22T13:51:05.9489263+08:00;True|2022-11-22T13:38:01.0719076+08:00;True|2022-11-22T13:30:22.2908977+08:00;True|2022-11-18T16:47:27.4886314+08:00;True|2022-11-18T14:43:02.5982310+08:00;True|2022-11-16T20:16:00.9104448+08:00;True|2022-11-16T20:11:19.4807083+08:00;True|2022-11-16T16:57:13.9042012+08:00;True|2022-11-16T16:46:44.0991343+08:00;True|2022-11-16T16:37:19.0406103+08:00;True|2022-11-16T16:19:38.4156261+08:00;True|2022-11-16T16:16:04.9357078+08:00;True|2022-11-16T16:04:29.0981277+08:00;True|2022-11-07T00:11:01.0022062+08:00;True|2022-11-07T00:09:31.8325304+08:00;True|2022-11-07T00:06:25.4979105+08:00;True|2022-11-07T00:05:24.0128128+08:00;True|2022-11-07T00:02:26.6792917+08:00;True|2022-11-07T00:02:07.7671121+08:00;True|2022-11-06T23:58:11.3413300+08:00;True|2022-11-06T23:56:11.6286341+08:00;True|2022-11-06T23:54:57.9713190+08:00;True|2022-11-06T23:52:32.4429994+08:00;True|2022-11-06T23:51:06.4175914+08:00;True|2022-11-06T23:49:52.5557919+08:00;True|2022-11-06T23:47:25.1764937+08:00;True|2022-11-06T23:24:08.0785351+08:00;True|2022-11-06T23:22:03.7439204+08:00;True|2022-11-06T23:20:00.2289162+08:00;True|2022-11-06T23:18:55.7287420+08:00;True|2022-11-06T23:17:13.8177388+08:00;True|2022-11-06T23:16:22.9839714+08:00;True|2022-11-06T23:14:39.0422764+08:00;True|2022-11-06T23:11:40.2239132+08:00;True|2022-11-06T23:01:29.5083665+08:00;True|2022-11-06T23:00:53.6963635+08:00;True|2022-11-06T22:59:51.4246351+08:00;True|2022-11-06T22:57:50.3226878+08:00;True|2022-11-06T22:54:47.4900860+08:00;True|2022-11-06T22:53:15.7434540+08:00;True|2022-11-06T22:52:33.5018758+08:00;True|2022-11-06T22:51:37.4497891+08:00;True|2022-11-06T22:50:29.9658014+08:00;True|2022-11-06T22:47:13.6003785+08:00;True|2022-11-06T22:45:55.6965741+08:00;True|2022-11-06T22:42:15.5166921+08:00;True|2022-11-06T22:41:22.2314122+08:00;True|2022-11-06T22:40:45.8688562+08:00;True|2022-11-06T22:40:05.5540223+08:00;True|2022-11-06T22:38:04.6800826+08:00;True|2022-11-06T22:36:26.8903126+08:00;True|2022-11-06T22:28:50.1569466+08:00;True|2022-11-06T22:24:24.8450157+08:00;True|2022-11-06T22:22:42.8380587+08:00;True|2022-11-06T22:20:33.2909423+08:00;True|2022-11-06T22:17:55.6322289+08:00;True|2022-11-06T22:16:02.1725875+08:00;True|2022-11-06T22:14:56.2399452+08:00;True|2022-11-06T22:11:20.6258450+08:00;True|2022-11-06T21:39:55.0834387+08:00;True|2022-11-06T21:24:07.2677181+08:00;True|2022-11-06T21:22:32.4372436+08:00;True|2022-11-06T21:21:21.8242808+08:00;True|2022-11-06T21:20:50.5922166+08:00;True|2022-11-06T21:18:02.4445054+08:00;True|2022-11-06T21:15:41.3737211+08:00;True|2022-11-06T21:15:23.0607120+08:00;True|2022-11-06T21:09:09.6026319+08:00;True|2022-11-06T21:05:54.5433653+08:00;True|2022-11-06T21:05:05.1794341+08:00;True|2022-11-06T21:04:35.1035978+08:00;True|2022-11-06T21:03:20.2389996+08:00;True|2022-11-06T21:02:16.6261441+08:00;True|2022-11-06T20:59:54.1997768+08:00;True|2022-11-06T20:59:25.6586877+08:00;True|2022-11-06T20:59:01.9535660+08:00;True|2022-11-06T20:57:04.4434720+08:00;True|2022-11-06T20:48:01.4587772+08:00;True|2022-11-06T20:47:42.8328288+08:00;True|2022-11-06T20:47:22.6138834+08:00;True|2022-11-06T20:45:37.6953074+08:00;True|2022-11-06T20:43:59.9297691+08:00;True|2022-11-06T20:40:27.3134811+08:00;True|2022-11-06T20:39:10.9109046+08:00;True|2022-11-06T20:38:32.0656489+08:00;True|2022-11-06T20:37:30.1638511+08:00;True|2022-11-06T20:32:59.7205048+08:00;True|2022-11-04T17:16:05.7419249+08:00;True|2022-11-04T17:15:31.0425173+08:00;True|2022-11-04T17:07:38.3581110+08:00;True|2022-11-04T17:07:12.1626517+08:00;True|2022-11-04T17:06:41.4748460+08:00;True|2022-11-04T17:01:55.1542465+08:00;True|2022-11-04T16:57:30.0789538+08:00;True|2022-11-04T16:48:42.3331909+08:00;True|2022-11-04T16:47:54.9363158+08:00;True|2022-11-04T16:34:25.1608306+08:00;True|2022-11-04T16:34:05.2612149+08:00;True|2022-11-04T16:01:44.6861859+08:00;True|2022-11-04T15:57:41.9143744+08:00;True|2022-11-04T15:56:07.8404679+08:00;True|2022-11-04T15:47:53.3443162+08:00;True|2022-11-04T15:36:39.4424290+08:00;True|2022-11-04T15:35:20.1484792+08:00;True|2022-11-04T15:33:03.2201293+08:00;True|2022-11-04T15:28:49.8690484+08:00;True|2022-11-04T15:28:19.2314864+08:00;True|2022-11-04T15:25:58.5731227+08:00;True|2022-11-04T15:25:27.8755079+08:00;True|2022-11-04T15:23:36.6120285+08:00;True|2022-11-04T15:21:31.3420344+08:00;True|2022-11-04T15:21:14.6592668+08:00;True|2022-11-04T15:20:56.2465403+08:00;True|2022-11-04T15:20:15.8930937+08:00;True|2022-11-04T15:19:17.7528547+08:00;True|2022-11-04T15:18:23.5955076+08:00;True|2022-11-04T15:14:21.0858315+08:00;True|2022-11-04T15:06:42.8088023+08:00;True|2022-11-04T15:05:35.1788684+08:00;True|2022-11-04T15:02:42.8758239+08:00;True|2022-11-04T15:01:57.5968687+08:00;True|2022-11-04T15:01:27.4523012+08:00;True|2022-11-04T15:01:06.3867535+08:00;True|2022-11-04T15:00:46.6202709+08:00;True|2022-11-04T15:00:26.5448800+08:00;True|2022-11-04T15:00:02.5522605+08:00;True|2022-11-04T14:59:16.7492747+08:00;True|2022-11-04T14:58:30.8358796+08:00;True|2022-11-04T14:58:04.5157418+08:00;True|2022-11-04T14:56:28.3222498+08:00;True|2022-11-04T14:53:55.4282929+08:00;True|2022-11-04T14:38:08.8607315+08:00;True|2022-11-04T14:36:57.9054167+08:00;True|2022-11-04T14:32:33.1953337+08:00;True|2022-11-04T14:29:45.6053971+08:00;True|2022-11-04T14:26:10.7088759+08:00;True|2022-11-04T14:20:11.5550052+08:00;True|2022-11-04T14:09:55.4914871+08:00;True|2022-11-04T14:08:13.9781669+08:00;True|2022-11-04T14:05:55.9684715+08:00;True|2022-11-04T14:02:31.6815309+08:00;True|2022-11-04T11:33:40.4684952+08:00;True|2022-11-04T11:32:29.4394464+08:00;True|2022-11-04T11:31:27.0585751+08:00;True|2022-11-04T11:17:24.8001745+08:00;True|2022-11-04T10:18:45.5943976+08:00;True|2022-11-04T10:17:59.4067621+08:00;True|2022-11-04T10:08:19.0043776+08:00;True|2022-11-04T10:05:14.0678303+08:00;True|2022-11-04T10:04:17.6584589+08:00;True|2022-11-04T10:00:12.3564632+08:00;True|2022-11-04T09:58:09.8045020+08:00;True|2022-11-04T09:57:18.0742428+08:00;True|2022-11-04T09:46:40.4989929+08:00;True|2022-11-04T09:44:29.4740744+08:00;True|2022-11-04T09:40:08.8824983+08:00;True|2022-11-04T09:39:16.7759248+08:00;True|2022-11-04T09:36:25.8271389+08:00;True|2022-11-04T09:35:27.7887610+08:00;True|2022-11-04T09:32:50.0572867+08:00;True|2022-11-04T09:30:27.5167728+08:00;True|2022-11-04T08:28:28.7622871+08:00;True|2022-11-04T00:41:49.1309755+08:00;True|2022-11-04T00:26:55.4920728+08:00;True|2022-11-04T00:22:01.7915908+08:00;True|2022-11-04T00:20:25.8839292+08:00;True|2022-11-04T00:19:36.1178115+08:00;True|2022-11-03T22:30:24.0630642+08:00;True|2022-11-03T22:29:48.8822001+08:00;True|2022-11-03T22:28:39.4945416+08:00;True|2022-11-03T22:22:05.1296769+08:00;True|2022-11-03T22:20:01.9154172+08:00;True|2022-11-03T22:12:47.0912314+08:00;True|2022-11-03T22:09:51.6008375+08:00;True|2022-11-03T22:08:19.8051794+08:00;True|2022-11-03T22:02:37.8131329+08:00;True|2022-11-03T22:01:59.8171139+08:00;True|2022-11-03T22:01:12.8921261+08:00;True|2022-11-03T21:58:04.3881404+08:00;True|2022-11-03T21:56:34.0258019+08:00;True|2022-11-03T21:49:08.3433049+08:00;True|2022-11-03T21:47:42.8047403+08:00;True|2022-11-03T17:44:06.0546647+08:00;True|2022-11-03T17:42:29.4844080+08:00;True|2022-11-03T17:40:31.0155249+08:00;True|2022-11-03T17:31:12.8261511+08:00;True|2022-11-03T17:30:46.5156389+08:00;True|2022-11-03T17:30:18.4004466+08:00;True|2022-11-03T17:29:19.2711984+08:00;True|2022-11-03T17:24:56.0912325+08:00;True|2022-11-03T17:23:00.5463265+08:00;True|2022-11-03T17:22:01.9297589+08:00;True|2022-11-03T17:13:25.4542049+08:00;True|2022-11-03T17:12:53.7502815+08:00;True|2022-11-03T17:09:52.5458393+08:00;True|2022-11-03T17:07:01.0548611+08:00;True|2022-11-03T17:05:20.6638108+08:00;True|2022-11-03T16:33:01.5185760+08:00;True|2022-11-03T16:19:14.9272415+08:00;True|2022-11-03T16:17:36.2529819+08:00;True|2022-11-03T16:13:29.9858980+08:00;True|2022-11-03T16:06:11.4462234+08:00;True|2022-11-03T16:02:48.4670667+08:00;True|2022-11-03T16:01:56.0060862+08:00;True|2022-11-03T15:58:30.5958027+08:00;True|2022-11-03T15:56:05.1001674+08:00;True|2022-11-03T15:42:14.4100003+08:00;True|2022-11-03T15:41:54.5236682+08:00;True|2022-11-03T15:33:56.9550219+08:00;True|2022-11-03T15:31:53.5459229+08:00;True|2022-11-03T15:29:52.0292825+08:00;True|2022-11-03T15:29:26.8006363+08:00;True|2022-11-03T15:28:42.3599187+08:00;True|2022-11-03T15:27:05.8638897+08:00;True|2022-11-03T15:26:21.8683662+08:00;True|2022-11-03T15:22:02.5546983+08:00;True|2022-11-03T15:20:18.4083041+08:00;True|2022-11-03T15:18:21.3166314+08:00;True|2022-11-03T15:15:35.3547054+08:00;True|2022-11-03T15:14:45.7066271+08:00;True|2022-11-03T15:14:18.6680750+08:00;True|2022-11-03T15:13:17.4086063+08:00;True|2022-11-03T15:12:49.1551614+08:00;True|2022-11-03T15:09:54.2966404+08:00;True|2022-11-03T15:08:33.2643354+08:00;True|2022-11-03T15:03:48.4677065+08:00;True|2022-11-03T15:03:20.6766386+08:00;True|2022-11-03T15:02:25.4759343+08:00;True|2022-11-03T15:01:43.3949160+08:00;True|2022-11-03T14:59:36.7755914+08:00;True|2022-11-03T14:59:08.3032217+08:00;True|2022-11-03T14:54:05.7546420+08:00;True|2022-11-03T14:53:12.5285933+08:00;True|2022-11-03T14:48:35.9447335+08:00;True|2022-11-03T14:44:04.9920640+08:00;True|2022-11-03T14:39:55.1850754+08:00;True|2022-11-03T14:34:44.6106265+08:00;True|2022-11-03T14:34:11.2891151+08:00;True|2022-11-03T14:33:28.3522973+08:00;True|2022-11-03T14:30:32.2859923+08:00;True|2022-11-03T14:29:49.2885812+08:00;True|2022-11-03T14:27:09.6099674+08:00;True|2022-11-03T14:22:35.6088773+08:00;True|2022-11-03T14:19:02.1393788+08:00;True|2022-11-03T14:13:07.2753590+08:00;True|2022-11-03T13:25:48.9286083+08:00;True|2022-11-03T13:24:20.3673861+08:00;True|2022-11-03T11:34:28.3126472+08:00;True|2022-11-03T11:25:23.5007075+08:00;True|2022-11-03T11:09:26.2340839+08:00;True|2022-11-03T11:07:13.9141127+08:00;True|2022-11-03T11:06:43.5970449+08:00;True|2022-11-03T11:05:01.8003653+08:00;True|2022-09-21T00:24:42.4485117+08:00;True|2022-09-21T00:23:30.6165996+08:00;True|2022-09-21T00:21:54.0769223+08:00;True|2022-09-21T00:21:11.2674898+08:00;True|2022-09-21T00:17:52.6509285+08:00;True|2022-09-21T00:15:38.6038978+08:00;True|2022-09-21T00:14:54.7621848+08:00;True|2022-09-21T00:11:51.5120522+08:00;True|2022-09-21T00:11:09.6108434+08:00;True|2022-09-21T00:07:17.7642560+08:00;True|2022-09-21T00:06:18.2299285+08:00;True|2022-09-21T00:02:45.7037170+08:00;True|2022-09-20T23:59:19.3350238+08:00;True|2022-09-20T23:56:46.9651144+08:00;True|2022-09-20T23:54:12.3823374+08:00;True|2022-09-20T23:53:15.0925458+08:00;True|2022-09-20T23:49:36.1374365+08:00;True|2022-09-20T23:48:54.3758405+08:00;True|2022-09-20T23:47:39.0472308+08:00;True|2022-09-20T23:42:54.1215607+08:00;True|2022-09-20T23:40:15.7725224+08:00;True|2022-09-20T23:37:14.7037503+08:00;True|2022-09-20T23:35:19.1982323+08:00;True|2022-09-20T23:34:31.1566961+08:00;True|2022-09-20T23:28:48.6099271+08:00;True|2022-09-20T19:45:29.9390200+08:00;True|2022-09-20T19:44:19.1113026+08:00;True|2022-09-20T19:40:24.1980933+08:00;True|2022-09-20T18:58:46.4824143+08:00;True|2022-09-20T18:57:21.9534366+08:00;True|2022-09-20T18:56:42.9309370+08:00;True|2022-09-20T18:54:52.6889849+08:00;True|2022-09-20T18:53:31.8030276+08:00;True|2022-09-20T18:53:00.2573323+08:00;True|2022-09-20T18:49:46.0480599+08:00;True|2022-09-20T18:49:15.4245121+08:00;True|2022-09-20T18:47:46.6323413+08:00;True|2022-09-20T18:47:23.6189860+08:00;True|2022-09-20T18:33:04.6766413+08:00;True|2022-09-20T18:32:43.0581554+08:00;True|2022-09-20T18:29:15.1323389+08:00;True|2022-09-20T18:26:24.4735929+08:00;True|2022-09-20T18:22:58.6560001+08:00;True|2022-09-20T18:19:37.1345950+08:00;True|2022-09-20T18:14:12.1501278+08:00;True|2022-09-20T18:10:26.5141290+08:00;True|2022-09-20T14:10:02.2009114+08:00;True|2022-09-20T14:09:18.7490338+08:00;True|2022-09-20T14:06:07.1071862+08:00;True|2022-09-20T14:05:36.7602842+08:00;True|2022-09-20T14:05:06.4981580+08:00;True|2022-09-20T13:55:02.6977754+08:00;True|2022-09-20T13:54:33.9625686+08:00;True|2022-09-20T13:53:30.0074842+08:00;True|2022-09-20T13:50:53.6752731+08:00;True|2022-09-20T13:50:40.0825979+08:00;True|2022-09-20T13:50:08.3533920+08:00;True|2022-09-20T13:47:59.8029351+08:00;True|2022-09-20T13:47:16.2233986+08:00;True|2022-09-20T13:45:34.8991820+08:00;True|2022-09-20T13:43:06.3282277+08:00;True|2022-09-20T13:42:49.3974738+08:00;True|2022-09-20T13:41:52.4576423+08:00;True|2022-09-20T13:39:45.2665520+08:00;True|2022-09-20T13:37:11.9786744+08:00;True|2022-09-20T13:35:59.7951042+08:00;True|2022-09-20T13:21:24.7591933+08:00;True|2022-09-20T13:19:08.4384006+08:00;True|2022-09-20T13:17:44.6880505+08:00;True|2022-09-20T13:17:23.6699248+08:00;True|2022-09-20T11:37:48.6978366+08:00;True|2022-09-20T11:28:51.6591514+08:00;True|2022-09-20T11:26:35.5353930+08:00;True|2022-09-20T11:21:16.9312199+08:00;True|2022-09-20T11:12:54.7028539+08:00;True|2022-09-20T11:10:58.6925584+08:00;True|2022-09-20T11:07:07.1581858+08:00;True|2022-09-20T11:06:00.0552909+08:00;True|2022-09-20T11:04:58.3262758+08:00;True|2022-09-20T10:30:01.3491236+08:00;True|2022-09-20T10:27:55.6155047+08:00;True|2022-09-20T10:24:34.6450658+08:00;True|2022-09-19T23:30:53.7584842+08:00;True|2022-09-19T22:47:14.7408779+08:00;True|2022-09-19T22:17:14.4843402+08:00;True|2022-09-19T22:16:17.9460099+08:00;True|2022-09-19T19:56:08.2171887+08:00;True|2022-09-19T19:55:32.9843461+08:00;True|2022-09-19T19:47:35.1616545+08:00;True|2022-09-19T19:42:07.8274340+08:00;True|2022-09-19T19:36:57.0678726+08:00;True|2022-09-19T19:27:08.7570956+08:00;True|2022-09-19T18:47:11.9251708+08:00;True|2022-09-19T18:32:41.9046960+08:00;True|2022-09-19T18:32:11.2964953+08:00;True|2022-09-19T18:31:01.8241547+08:00;True|2022-09-19T18:30:08.3809783+08:00;True|2022-09-19T18:28:30.9383874+08:00;True|2022-09-19T18:28:00.4089752+08:00;True|2022-09-19T18:26:31.7588875+08:00;True|2022-09-19T18:23:37.1844263+08:00;True|2022-09-19T18:19:23.5223220+08:00;True|2022-09-19T18:16:24.3671030+08:00;True|2022-09-19T18:15:42.3314404+08:00;True|2022-09-19T18:14:58.3459891+08:00;True|2022-09-19T18:13:11.8126928+08:00;True|2022-09-19T18:12:05.3523035+08:00;True|2022-09-19T18:09:38.8508196+08:00;True|2022-09-19T18:06:18.8343501+08:00;True|2022-09-19T18:04:24.6365367+08:00;True|2022-09-19T18:04:02.7161180+08:00;True|2022-09-19T17:52:39.7243696+08:00;True|2022-09-19T17:48:02.8812149+08:00;True|2022-09-19T17:45:35.2966258+08:00;True|2022-09-19T17:45:10.3682448+08:00;True|2022-09-19T17:28:06.4075409+08:00;True|2022-09-19T17:27:05.5352183+08:00;True|2022-09-19T17:25:49.0446351+08:00;True|2022-09-19T17:19:56.8408764+08:00;True|2022-09-19T17:15:11.2854975+08:00;True|2022-09-19T17:10:09.9797179+08:00;True|2022-09-19T17:05:23.9082254+08:00;True|2022-09-19T16:49:34.8166120+08:00;True|2022-09-19T16:48:32.6138453+08:00;True|2022-09-19T16:11:09.7720374+08:00;True|2022-09-19T16:06:49.6910257+08:00;True|2022-09-19T15:48:55.0951009+08:00;True|2022-09-19T15:44:09.3805562+08:00;True|2022-09-19T15:37:00.7111476+08:00;True|2022-09-19T15:32:58.6290979+08:00;True|2022-09-19T15:19:30.0278345+08:00;True|2022-09-19T14:52:21.8632856+08:00;True|2022-09-19T14:38:46.4553306+08:00;True|2022-09-19T13:42:01.4506384+08:00;True|2022-09-19T12:58:28.9049920+08:00;True|2022-09-19T12:54:59.4516607+08:00;True|2022-09-19T12:53:31.5725119+08:00;True|2022-09-19T12:52:22.3794262+08:00;True|2022-09-19T12:51:19.9303172+08:00;True|2022-09-19T11:33:05.9759430+08:00;True|2022-09-19T11:22:45.6218002+08:00;True|2022-09-19T11:21:44.6218188+08:00;True|2022-09-19T11:18:19.6585697+08:00;True|2022-09-19T10:01:42.8751827+08:00;True|2022-09-19T09:59:27.6894579+08:00;True|2022-09-19T09:58:29.7812140+08:00;True|2022-09-19T09:57:35.1691613+08:00;True|2022-09-19T09:54:54.0826547+08:00;True|2022-09-19T09:53:33.8031967+08:00;True|2022-09-19T09:52:06.4097498+08:00;True|2022-09-19T09:49:23.0812347+08:00;True|2022-09-19T09:48:08.4656403+08:00;True|2022-09-19T09:41:43.8664570+08:00;True|2022-09-19T09:38:54.9598501+08:00;True|2022-09-19T09:31:13.2756714+08:00;True|2022-09-19T09:28:35.3347576+08:00;True|2022-09-19T09:28:16.1346235+08:00;True|2022-09-19T09:22:21.9158555+08:00;True|2022-09-19T09:19:53.2457860+08:00;True|2022-09-19T09:17:40.4767786+08:00;True|2022-09-19T09:12:52.3269838+08:00;True|2022-09-19T09:06:28.3404743+08:00;True|2022-09-16T14:39:46.1538149+08:00;True|2022-09-16T14:38:39.3325490+08:00;True|2022-09-16T14:37:28.6292760+08:00;True|2022-09-16T14:36:03.7325060+08:00;True|2022-09-16T14:24:03.7985017+08:00;True|2022-09-16T13:45:49.3535299+08:00;True|2022-09-16T13:41:57.3640518+08:00;True|2022-09-16T13:37:27.9575800+08:00;True|2022-09-16T13:07:39.5706914+08:00;True|2022-09-16T12:35:11.7621908+08:00;True|2022-09-16T12:31:39.2441241+08:00;True|2022-09-16T12:28:55.9457285+08:00;True|2022-09-16T11:31:23.6502800+08:00;True|2022-09-16T09:33:20.6715202+08:00;True|2022-09-16T09:10:35.5505705+08:00;True|2022-09-16T08:35:28.2496647+08:00;True|2022-09-16T00:24:45.7514509+08:00;True|2022-09-15T22:26:32.1774985+08:00;True|2022-09-15T22:13:21.4580735+08:00;True|2022-09-15T22:10:12.6638634+08:00;True|2022-09-15T22:06:52.3231872+08:00;True|2022-09-15T22:03:48.1232035+08:00;True|2022-09-15T21:56:19.4587246+08:00;True|2022-09-15T21:50:38.6051186+08:00;True|2022-09-15T21:46:09.3054239+08:00;True|2022-09-15T21:45:15.8817395+08:00;True|2022-09-15T21:43:15.9624978+08:00;True|2022-09-15T21:38:59.2924283+08:00;True|2022-09-15T21:38:21.6340686+08:00;True|2022-09-15T21:36:02.8290156+08:00;True|2022-09-15T21:35:02.7056919+08:00;True|2022-09-15T21:34:19.6891136+08:00;True|2022-09-15T21:31:11.3145325+08:00;True|2022-09-15T21:28:32.6724932+08:00;True|2022-09-15T21:27:40.1468647+08:00;True|2022-09-15T21:25:54.4154279+08:00;True|2022-09-15T21:19:36.4265440+08:00;True|2022-09-15T21:15:06.1954350+08:00;True|2022-09-15T21:12:02.1375641+08:00;True|2022-09-15T21:11:17.0507035+08:00;True|2022-09-15T21:10:19.5589695+08:00;True|2022-09-15T21:09:21.0837046+08:00;True|2022-09-15T21:08:23.0829740+08:00;True|2022-09-15T21:07:23.0373422+08:00;True|2022-09-15T18:03:10.6944516+08:00;True|2022-09-15T18:00:59.8420469+08:00;True|2022-09-15T18:00:16.7451463+08:00;True|2022-09-15T17:58:04.6820715+08:00;True|2022-09-15T17:56:08.2796295+08:00;True|2022-09-15T17:50:21.3996440+08:00;True|2022-09-15T17:09:03.4466699+08:00;True|2022-09-15T17:05:00.6245961+08:00;True|2022-09-15T17:00:29.9220310+08:00;True|2022-09-15T16:55:51.9658511+08:00;True|2022-09-15T16:42:52.9815324+08:00;True|2022-09-15T16:37:08.8417108+08:00;True|2022-09-15T16:35:56.8700509+08:00;True|2022-09-15T16:29:30.7469398+08:00;True|2022-09-15T16:28:08.7490741+08:00;True|2022-09-15T16:26:06.9984448+08:00;True|2022-09-15T16:20:58.5626601+08:00;True|2022-09-15T16:13:51.8350616+08:00;True|2022-09-15T16:10:45.2646587+08:00;True|2022-09-15T16:04:50.7032017+08:00;True|2022-09-15T16:03:20.6149583+08:00;True|2022-09-15T16:01:46.9991407+08:00;True|2022-09-15T15:59:04.7876393+08:00;True|2022-09-15T15:49:56.0560711+08:00;True|2022-09-15T15:46:30.2125881+08:00;True|2022-09-15T15:44:33.2232339+08:00;True|2022-09-15T15:41:53.8571301+08:00;True|2022-09-15T15:39:41.1657391+08:00;True|2022-09-15T15:36:16.7669816+08:00;True|2022-09-15T15:31:09.9099918+08:00;True|2022-09-15T15:28:59.7558234+08:00;True|2022-09-15T15:27:48.2279743+08:00;True|2022-09-15T15:25:50.9593671+08:00;True|2022-09-15T15:18:46.2144526+08:00;True|2022-09-15T15:10:53.9713944+08:00;True|2022-09-15T15:08:13.2429308+08:00;True|2022-09-15T14:58:40.9148959+08:00;True|2022-09-15T14:41:20.0399075+08:00;True|2022-09-15T14:33:11.8106454+08:00;True|2022-08-13T17:30:30.8881784+08:00;True|2022-08-11T21:31:04.7242868+08:00;True|2022-08-09T20:40:34.4220320+08:00;True|2022-08-08T14:31:56.5315323+08:00;True|2022-08-03T18:44:00.0395786+08:00;True|2022-07-12T13:58:49.8900918+08:00;True|2022-07-01T09:09:47.0947686+08:00;True|2022-06-30T12:28:33.5694934+08:00;True|2022-06-14T11:19:56.5428784+08:00;True|2022-06-10T13:43:02.7010531+08:00;True|2022-05-13T14:56:55.6031908+08:00;True|2022-04-22T17:26:31.1780137+08:00;True|2022-04-19T16:20:09.8422169+08:00;False|2022-04-12T15:13:02.1028573+08:00;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="bin/layuiadmin/style/admin.css">
@@ -18,10 +18,10 @@
       <publishTime>01/28/2016 14:22:24</publishTime>
     </File>
     <File Include="bin/WebTM.dll">
-      <publishTime>11/22/2022 20:56:45</publishTime>
+      <publishTime>11/28/2022 15:16:21</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>11/22/2022 20:56:45</publishTime>
+      <publishTime>11/28/2022 15:16:21</publishTime>
     </File>
     <File Include="HtmlPage1.html">
       <publishTime>05/07/2022 15:22:21</publishTime>
@@ -678,7 +678,7 @@
       <publishTime>04/13/2021 10:12:43</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig.js">
-      <publishTime>11/21/2022 13:20:23</publishTime>
+      <publishTime>11/28/2022 08:00:29</publishTime>
     </File>
     <File Include="layuiadmin/soulTable.slim.js">
       <publishTime>09/08/2022 16:30:15</publishTime>
@@ -822,7 +822,7 @@
       <publishTime>07/01/2022 23:02:27</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjList.html">
-      <publishTime>02/25/2022 09:01:10</publishTime>
+      <publishTime>11/26/2022 21:00:20</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_CustomerList.html">
       <publishTime>02/25/2022 09:01:10</publishTime>
@@ -831,13 +831,13 @@
       <publishTime>02/25/2022 09:01:10</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_DormList.html">
-      <publishTime>02/25/2022 09:01:10</publishTime>
+      <publishTime>11/26/2022 21:00:20</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_DutyList.html">
-      <publishTime>02/25/2022 09:01:10</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html">
-      <publishTime>09/21/2022 08:13:57</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html">
       <publishTime>11/08/2022 07:57:36</publishTime>
@@ -867,7 +867,7 @@
       <publishTime>02/25/2022 09:01:10</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_PostList.html">
-      <publishTime>02/25/2022 09:01:10</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_ProcList.html">
       <publishTime>02/25/2022 09:01:10</publishTime>
@@ -899,6 +899,15 @@
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html">
       <publishTime>06/07/2022 13:23:32</publishTime>
     </File>
+    <File Include="views/Baseset/鍩虹璧勬枡/Gy_TechnologyParameterList.html">
+      <publishTime>11/26/2022 21:00:21</publishTime>
+    </File>
+    <File Include="views/Baseset/鍩虹璧勬枡/Gy_TechParameterUnitList.html">
+      <publishTime>11/26/2022 21:00:21</publishTime>
+    </File>
+    <File Include="views/Baseset/鍩虹璧勬枡/Gy_UnitGroup.html">
+      <publishTime>11/16/2022 20:41:54</publishTime>
+    </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_UnitList.html">
       <publishTime>02/25/2022 09:01:10</publishTime>
     </File>
@@ -906,7 +915,7 @@
       <publishTime>02/25/2022 09:01:10</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html">
-      <publishTime>02/25/2022 09:01:11</publishTime>
+      <publishTime>11/26/2022 18:31:35</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseList_JIT.html">
       <publishTime>11/08/2022 07:57:36</publishTime>
@@ -921,7 +930,7 @@
       <publishTime>02/25/2022 09:01:11</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.html">
-      <publishTime>02/25/2022 09:01:11</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WWBadWHList.html">
       <publishTime>11/08/2022 07:57:36</publishTime>
@@ -1290,7 +1299,7 @@
       <publishTime>07/12/2021 13:13:53</publishTime>
     </File>
     <File Include="views/index.html">
-      <publishTime>11/17/2022 18:53:30</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/indexMenu.html">
       <publishTime>02/25/2022 13:31:16</publishTime>
@@ -1338,7 +1347,7 @@
       <publishTime>11/16/2021 13:56:00</publishTime>
     </File>
     <File Include="views/PublicPage/GroupInformation.html">
-      <publishTime>09/08/2022 16:30:15</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/PublicPage/Gy_Maintain.html">
       <publishTime>02/25/2022 09:01:11</publishTime>
@@ -1581,10 +1590,10 @@
       <publishTime>04/13/2021 10:12:44</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">
-      <publishTime>09/08/2022 16:30:15</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">
-      <publishTime>09/08/2022 16:30:15</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_CheckList_New.html">
       <publishTime>06/07/2022 13:23:32</publishTime>
@@ -1593,7 +1602,7 @@
       <publishTime>06/07/2022 13:23:32</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/28/2022 15:13:23</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
       <publishTime>08/25/2022 14:53:58</publishTime>
@@ -1659,13 +1668,13 @@
       <publishTime>02/25/2022 09:01:11</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html">
-      <publishTime>11/16/2022 20:41:54</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html">
       <publishTime>11/16/2021 13:56:00</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Material.html">
-      <publishTime>11/16/2022 20:41:54</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
       <publishTime>02/25/2022 09:01:11</publishTime>
@@ -1689,10 +1698,10 @@
       <publishTime>02/25/2022 09:01:11</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html">
-      <publishTime>11/16/2022 20:41:54</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html">
-      <publishTime>02/25/2022 09:01:11</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html">
       <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1710,7 +1719,7 @@
       <publishTime>02/25/2022 09:01:11</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Xt_ORGANIZATIONSList.html">
-      <publishTime>11/16/2022 20:41:54</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/b.grf">
       <publishTime>11/16/2021 13:56:00</publishTime>
@@ -1782,7 +1791,7 @@
       <publishTime>02/25/2022 09:01:11</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html">
-      <publishTime>11/16/2022 20:41:54</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html">
       <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1809,7 +1818,7 @@
       <publishTime>11/08/2022 07:57:36</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html">
-      <publishTime>11/16/2022 20:41:54</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
       <publishTime>11/16/2021 13:56:00</publishTime>
@@ -1880,8 +1889,11 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameter_Add_Edit_.html">
       <publishTime>09/21/2022 08:13:57</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechParamByProc.html">
+      <publishTime>11/26/2022 21:00:21</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechParamByProcList.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechParamByProcList_Add_Edit_.html">
       <publishTime>09/21/2022 08:13:57</publishTime>
@@ -2088,10 +2100,10 @@
       <publishTime>11/08/2022 07:57:36</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMould.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMouldList.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckEdit.html">
       <publishTime>08/25/2022 14:53:58</publishTime>
@@ -2151,10 +2163,10 @@
       <publishTime>07/01/2022 23:02:27</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkDay.html">
       <publishTime>11/21/2022 10:54:36</publishTime>
@@ -2211,7 +2223,7 @@
       <publishTime>11/08/2022 07:57:36</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBill.html">
-      <publishTime>11/21/2022 08:27:09</publishTime>
+      <publishTime>11/22/2022 21:04:22</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html">
       <publishTime>11/21/2022 08:27:09</publishTime>
@@ -2589,7 +2601,7 @@
       <publishTime>05/07/2022 15:22:21</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
-      <publishTime>11/10/2022 08:18:09</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_CheckToolsFileMainList.html">
       <publishTime>04/13/2021 10:12:44</publishTime>
@@ -2611,6 +2623,9 @@
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould_Edit.html">
       <publishTime>09/13/2021 09:24:54</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Kf_ProductInBillList.html">
       <publishTime>04/26/2021 11:08:02</publishTime>
@@ -2694,7 +2709,7 @@
       <publishTime>03/28/2022 09:21:28</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
-      <publishTime>11/10/2022 08:18:09</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_CheckToolsFileMainList.html">
       <publishTime>04/13/2021 10:12:44</publishTime>
@@ -3014,11 +3029,14 @@
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit.html">
       <publishTime>11/17/2022 18:53:30</publishTime>
     </File>
+    <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">
+      <publishTime>11/26/2022 21:00:21</publishTime>
+    </File>
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillImport.html">
-      <publishTime>11/17/2022 18:53:30</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
-      <publishTime>11/17/2022 18:53:30</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
       <publishTime>07/20/2021 08:11:29</publishTime>
@@ -3237,13 +3255,13 @@
       <publishTime>08/25/2022 14:53:58</publishTime>
     </File>
     <File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserGroupList.html">
-      <publishTime>11/17/2022 18:53:30</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserGroupListEdit.html">
       <publishTime>11/17/2022 18:53:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserList.html">
-      <publishTime>02/25/2022 09:01:11</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserListEdit.html">
       <publishTime>11/17/2022 18:53:30</publishTime>
@@ -3258,7 +3276,7 @@
       <publishTime>07/12/2021 13:13:53</publishTime>
     </File>
     <File Include="views/绯荤粺绠＄悊/缁勭粐鏋舵瀯璁剧疆/Gy_DutyEdit.html">
-      <publishTime>11/16/2022 15:17:00</publishTime>
+      <publishTime>11/22/2022 21:04:22</publishTime>
     </File>
     <File Include="views/绯荤粺绠＄悊/缁勭粐鏋舵瀯璁剧疆/Gy_DutyList.html">
       <publishTime>11/17/2022 18:53:30</publishTime>
@@ -3522,7 +3540,7 @@
       <publishTime>02/24/2022 17:35:02</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍙枡绠＄悊/Jl_CallGoodsBillMain.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍙枡绠＄悊/鍙枡閫�鏂欏崟/JIT_BackGoods.html">
       <publishTime>03/29/2022 15:02:21</publishTime>
@@ -3567,10 +3585,10 @@
       <publishTime>02/25/2022 09:01:11</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
-      <publishTime>11/18/2022 16:55:41</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/22/2022 21:04:22</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/MES_StationOutBill_PDA.html">
       <publishTime>11/16/2021 13:56:00</publishTime>
@@ -3603,10 +3621,10 @@
       <publishTime>02/25/2022 09:01:11</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
-      <publishTime>11/16/2022 15:17:00</publishTime>
+      <publishTime>11/26/2022 21:00:21</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_loser.html">
       <publishTime>05/17/2021 19:07:00</publishTime>
@@ -3654,7 +3672,7 @@
       <publishTime>11/08/2022 07:57:36</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/ProductionPlanReportList.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/22/2022 21:04:22</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
       <publishTime>04/13/2021 10:12:45</publishTime>
@@ -3756,16 +3774,16 @@
       <publishTime>04/13/2021 10:12:45</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">
-      <publishTime>08/25/2022 14:53:58</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">
-      <publishTime>08/25/2022 14:53:58</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html">
       <publishTime>11/08/2022 07:57:36</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/28/2022 11:02:04</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html">
       <publishTime>11/08/2022 07:57:36</publishTime>
@@ -3798,7 +3816,7 @@
       <publishTime>11/17/2022 18:53:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html">
-      <publishTime>11/22/2022 17:48:23</publishTime>
+      <publishTime>11/26/2022 19:39:28</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html">
       <publishTime>11/08/2022 07:57:36</publishTime>
@@ -3816,7 +3834,7 @@
       <publishTime>11/22/2022 13:27:44</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html">
-      <publishTime>11/08/2022 07:57:36</publishTime>
+      <publishTime>11/22/2022 21:04:22</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">
       <publishTime>08/25/2022 14:53:58</publishTime>
@@ -3857,6 +3875,9 @@
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html">
       <publishTime>08/25/2022 14:53:58</publishTime>
     </File>
+    <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html">
+      <publishTime>11/22/2022 21:04:22</publishTime>
+    </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html">
       <publishTime>11/08/2022 07:57:36</publishTime>
     </File>
@@ -3864,10 +3885,10 @@
       <publishTime>04/13/2021 10:12:45</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">
-      <publishTime>09/08/2022 16:30:15</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">
-      <publishTime>09/08/2022 16:30:15</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html">
       <publishTime>11/21/2022 17:46:37</publishTime>
@@ -3885,10 +3906,10 @@
       <publishTime>04/13/2021 10:12:45</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">
-      <publishTime>09/08/2022 16:30:15</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">
-      <publishTime>09/08/2022 16:30:15</publishTime>
+      <publishTime>11/24/2022 09:50:25</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
       <publishTime>11/22/2022 20:56:26</publishTime>
@@ -3921,7 +3942,7 @@
       <publishTime>11/08/2022 07:57:36</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html">
-      <publishTime>11/18/2022 16:55:41</publishTime>
+      <publishTime>11/23/2022 13:36:18</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html">
       <publishTime>08/25/2022 14:53:58</publishTime>
@@ -3957,7 +3978,7 @@
       <publishTime>07/03/2022 15:37:59</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>11/22/2022 20:56:53</publishTime>
+      <publishTime>11/28/2022 15:16:35</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 954074c..19b78ed 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -121,6 +121,7 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWBadWHList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWWasterWHList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseList_JIT.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\OtherOutRequestBillList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
@@ -1034,6 +1035,7 @@
     <Content Include="views\璐ㄩ噺绠＄悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_PatrolProcCheckBillList.html" />
+    <Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\Kf_SCStockInCheckBill_Fast.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\Kf_QCStockInCheckBill_Fast.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBill.html" />
@@ -1094,6 +1096,7 @@
     <Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Check.html" />
     <Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
     <Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_Check_New.html" />
+    <Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_New.html" />
     <Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill_Check_New.html" />
     <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBackBillEdit.html" />
     <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBackBill_Fast.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 5a7af9b..4a4d6cf 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,7 +4,8 @@
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴*/
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
     //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
-    //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
+    var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
+    //var WEBURL = "http://localhost/WEBAPI/";   //棰滃鍙板紡鏈烘湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
index db444b1..5917fb2 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
@@ -22,7 +22,7 @@
                                 <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
                             </div>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
-                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
                         </div>
                     </div>
                 </form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DormList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DormList.html"
index f23bf95..abfe992 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DormList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DormList.html"
@@ -22,7 +22,7 @@
                                 <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
                             </div>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
-                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
                         </div>
                     </div>
                 </form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyList.html"
index 709aa3c..3a8e3f1 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyList.html"
@@ -22,7 +22,7 @@
                                 <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
                             </div>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
-                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
                         </div>
                     </div>
                 </form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index aeb9c10..79c155f 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -22,7 +22,7 @@
                                 <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
                             </div>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
-                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
                         </div>
                     </div>
                 </form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostList.html"
index 70ffafd..c63ca09 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostList.html"
@@ -22,7 +22,7 @@
                                 <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
                             </div>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
-                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
                         </div>
                     </div>
                 </form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseListNew.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseListNew.html"
index 2afbfd3..ef97a0d 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseListNew.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseListNew.html"
@@ -70,6 +70,9 @@
                     case "HSCWHID":  //杩斿洖璋冨嚭浠撳簱
                         parent.GetHSCWHNAMEValue(data);
                         break;
+                    case "HFIFOWHID":  //杩斿洖鍏堣繘鍏堝嚭浠撳簱
+                        parent.GetHFIFOWHNAMEValue(data);
+                        break;
                 }
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
index d1f35c6..03e5c65 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
@@ -22,7 +22,7 @@
                                 <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
                             </div>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
-                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
                         </div>
                     </div>
                 </form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html"
new file mode 100644
index 0000000..591d269
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html"
@@ -0,0 +1,238 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍑哄簱鐢宠鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <!--<div class="layui-inline">
+        <label class="layui-form-label">杩囨护鍒�</label>-->
+                        <!--<div class="layui-input-inline">
+        <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+    </div>-->
+                        <!--<div class="layui-col-xs12 layui-inline">
+            <div class="layui-row">
+                <div class="layui-inline">
+                    <label class="layui-form-label">浠ｇ爜</label>
+                    <div class="layui-input-block">
+                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">鍚嶇О</label>
+                    <div class="layui-input-block">
+                        <input type="text" class="layui-input" name="HName" id="HName">
+                    </div>
+                </div>
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                </button>
+            </div>
+            <div>
+                <table class="" id="mainTable" lay-filter="mainTable"></table>
+            </div>
+        </div>
+        <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+        <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+    </div>-->
+                        <div class="layui-col-xs12 layui-inline">
+                            <div class="layui-row">
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">鐢宠浜�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HRequestMan" id="HRequestMan" lay-verify="HRequestMan" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HRequestManID" id="HRequestManID" lay-verify="HRequestManID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HRequestManID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate1">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                            </div>
+                            <div>
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="mainTable"></table>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        //寮曠敤鐨勫崟鎹強妯″潡锛氬伐搴忔祦杞崱銆�
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+            , form = layui.form
+            , layer = layui.layer;
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', sort: true }
+                    , { field: 'HDate', title: '鏃ユ湡', sort: true }
+                    , { field: 'HMaker', title: '鍒跺崟浜�' }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //$.ajax({
+            //    url: GetWEBURL() + '/PublicPageMethod/EqpList',
+            //    type: "GET",
+            //    data: { "sWhere": sWhere },
+            //    success: function (data1) {
+            //        if (data1.count == 1) {
+            //            option.data = data1.data;
+            //            table.render(option);
+            //            layer.close(index);
+            //        } else {
+            //            layer.close(index);
+            //            layer.alert(data1.code + data1.Message, { icon: 5 });
+            //        }
+            //    }, error: function () {
+            //        layer.close(index);
+            //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //    }
+            //});
+
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                var HEmPID = $("#HRequestManID").val();
+                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+
+                if (HEmPID) {
+                    sWhere += " and HEmpID = " + HEmPID +"";
+                }
+                if (HDate) {
+                    sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/OtherOutRequestBillList/CX',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            });
+
+
+            form.on('submit(HRequestManID-BT)', function () {//閫夋嫨鐢宠浜�
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鐢宠浜哄垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+
+
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(Where) {
+                var index = layer.load();
+                var Value = Where;
+                if (Value == null) {
+                    Value = '';
+                }
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOutRequestBillList",
+                    async: true,
+                    data: { "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"] },
+                    //data: { "Value": Value },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                            table.reload('mainTable', {
+                                data: ajaxReturnData
+                                , height: 'full-10'
+                                , loading: false
+                                , done: function (index, res) {
+
+                                }
+                            });
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (result) {
+                        layer.close(index);
+                        console.log(result);
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                });
+            };
+        });
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/GroupInformation.html b/WebTM/views/PublicPage/GroupInformation.html
index d712074..9451bad 100644
--- a/WebTM/views/PublicPage/GroupInformation.html
+++ b/WebTM/views/PublicPage/GroupInformation.html
@@ -89,51 +89,6 @@
                 , tree = layui.tree
             var sWhere = "";
 
-            //tree.render({
-            //    elem: '#treeDepartment',
-            //    data: getData(sWhere),
-            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
-            //    id: 'demoId',
-            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
-            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
-            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
-            //    click: function (obj) {
-            //        //鐐瑰嚮楂樺厜
-            //        if (obj.data.id !== treeCkData.id) {
-            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
-            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
-            //            treeCkData = obj.data;
-            //            TagId = obj.data.id;
-            //            TagParentId = obj.data.ParentID;
-            //        }
-            //        else {
-            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
-            //            treeCkData = { id: 0 };
-            //            TagId = "";
-            //            TagParentId = "";
-            //        }
-
-
-            //        $.ajax({
-            //            url: GetWEBURL() + '/Gy_MaintenanceMode/GroupCX',
-            //            type: "GET",
-            //            data: { "HInterID": obj.data.id },
-            //            success: function (data1) {
-            //                if (data1.count == 1) {
-            //                    option.data = data1.data;
-            //                    table.render(option);
-            //                    layer.close(index);
-            //                } else {
-            //                    layer.close(index);
-            //                    layer.alert(data1.code + data1.Message, { icon: 5 });
-            //                }
-            //            }, error: function () {
-            //                layer.close(index);
-            //                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-            //            }
-            //        });
-            //    }
-            //});
             var option = {
                 elem: '#mainTable'
                 //, toolbar: '#toolbarDemo'
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index fc6222e..cc11353 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -154,6 +154,12 @@
                                       <cite>鏉ユ枡妫�楠屽崟</cite>
                                   </a>
                               </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/Kf_SCStockInCheckBill_Fast.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鐢熶骇妫�楠屽崟</cite>
+                                  </a>
+                              </li>
                           </ul>
                       </div>
                   </div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index f04dc0e..8b950f9 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -232,6 +232,7 @@
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">鏉＄爜鐢熸垚</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">鏉＄爜涓绘。缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">鏉＄爜鐘舵��</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 23c6a11..c2f9bd3 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -41,8 +41,9 @@
                             <li lay-id="1" style="padding:1px;" class="layui-this">閫夋嫨婧愬崟</li>
                             <li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
                             <li lay-id="3" style="padding:1px;">鏄庣粏淇℃伅</li>
-                            <li lay-id="4" style="padding:1px;">搴撳瓨淇℃伅</li>
-                            <li lay-id="5" style="padding:1px;min-width: 35px;">姹囨��</li>
+                            <li lay-id="4" style="padding:1px;">涓嬫灦淇℃伅</li>
+                            <li lay-id="5" style="padding:1px;">搴撳瓨淇℃伅</li>
+                            <li lay-id="6" style="padding:1px;min-width: 35px;">姹囨��</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--閫夋嫨婧愬崟-->
@@ -50,7 +51,7 @@
                                 <div class="layui-form-item">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
                                         </div>
                                         <div class="layui-col-xs8">
                                             <select name=" HBillType" id="HBillType">
@@ -69,13 +70,27 @@
                                 <div class="layui-form-item">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
                                         </div>
-                                        <div class="layui-col-xs5">
-                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
-                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                            <button type="button" id="HFIFOWHID-BT" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
                                         </div>
                                     </div>
                                 </div>
@@ -123,13 +138,13 @@
                                 <div class="layui-form-item">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
                                         </div>
-                                        <div class="layui-col-xs8">
-                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        <div class="layui-col-xs5">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
                                         </div>
-                                        <div class="layui-col-xs2">
-                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+                                        <div class="layui-col-xs3">
+                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
                                         </div>
                                     </div>
                                 </div>
@@ -290,15 +305,15 @@
                                     </div>
                                 </div>
                                 <!--<div class="layui-form-item" >
-                    <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
-                    <div class="layui-input-inline">
-                        <select name=" HBillType" id="HBillType">
-                            <option value="">浠撳簱璋冩嫧</option>
-                            <option value="">棰嗘枡璋冩嫧</option>
-                        </select>
-                        <input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">
-                    </div>
-                </div>-->
+                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
+                                <div class="layui-input-inline">
+                                    <select name=" HBillType" id="HBillType">
+                                        <option value="">浠撳簱璋冩嫧</option>
+                                        <option value="">棰嗘枡璋冩嫧</option>
+                                    </select>
+                                    <input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>-->
                             </div>
                             <!--鏄庣粏淇℃伅-->
                             <div class="layui-tab-item">
@@ -313,6 +328,10 @@
                                     </div>
                                 </div>
                                 <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                            </div>
+                            <!--涓嬫灦淇℃伅-->
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="FIFOlist-table" lay-filter="FIFOlist-table"></table>
                             </div>
                             <!--搴撳瓨淇℃伅-->
                             <div class="layui-tab-item">
@@ -510,6 +529,25 @@
                 RoadBillSub(linterid);
             }
 
+
+
+            //閫夋嫨鍏堣繘鍏堝嚭浠撳簱
+            form.on('submit(HFIFOWHID-BT)', function () {//閫夋嫨璋冨嚭浠撳簱
+                var HStockOutOrgID = $("#HStockOutOrgID").val();
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HFIFOWHID&HOrgID=' + HStockOutOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
 
             //閫夋嫨璋冨叆浠撳簱
             form.on('submit(HWHID-BT)', function () {//閫夋嫨璋冨叆浠撳簱
@@ -845,6 +883,30 @@
 
             //閫�鍑烘寜閽�
             form.on('submit(Cancel)', function () {
+                var sInterID = $("#HInterID").val()
+                var HBillType = '1207'
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
+                        async: true,
+                        data: { "HInterID": sInterID, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, {
+                                icon: 5,
+                                time: 20000
+                            }, function () {
+                            });
+                        }
+                    });
                 parent.location.href = "../../../views/index.html"
             })
 
@@ -899,6 +961,103 @@
                 }
             });
 
+            //#region 鎵弿婧愬崟鏉＄爜
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {      //鎵簮鍗�
+                if (event.keyCode == 13) {
+                    GetMeesageBySourceBillNo();
+                }
+            });
+
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
+            });
+
+            //鎵弿婧愬崟鏉＄爜
+            function GetMeesageBySourceBillNo(obj) {
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HBillType = '1207'
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var HSourceBillType = $("#HBillType").val()
+                var HMaker = sessionStorage["HUserName"]
+                var HFIFOWhID = $("#HFIFOWHID").val()
+                var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+                $.ajax({
+                    url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_Json",
+                    type: "GET",
+                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": HFIFOWhID, "HOWNERID": HStockOutOrgID },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            playSound1();
+                            HSourceFlag = true;
+                            if (result.data.hDeptIDField != 0) {
+                                $("#HDeptID").val(result.data.hDeptIDField);
+                                $("#HDeptName").val(result.data.hDeptNameField);
+                            }
+
+                            $("#HStockStyle").find("option:contains('" + result.data.hStockStyleField +"')").attr("selected", true);
+                            $("#HStockInOrgID").val(result.data.hStockInOrgIDField);
+                            $("#HStockInOrgName").val(result.data.hStockInOrgNameField);
+                            $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField);
+                            $("#HStockOutOrgName").val(result.data.hStockOutOrgNameField);
+                            $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+
+                            $("#HStockStyle").attr("disabled", "disabled");
+                            $("#HStockInOrgName").attr("readonly", "readonly");
+                            $("#HStockOutOrgName").attr("readonly", "readonly");
+                            $("#HBillType").attr("disabled", "disabled");
+                            form.render('select');
+                            if (result.data.hMulSourceFlagField == 0) {
+                                $("#HSourceBillNo").attr("readonly", "readonly");
+                            }
+                            layer.load(3);
+                            element.tabChange('tab-MoveStockBill', '2');
+
+                            $.ajax({
+                                url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                type: "GET",
+                                data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+                                success: function (result) {
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        listOption.data = result.data.Materlist;
+                                        table.render(listOption);
+                                        FIFOlistOption.data = result.data.FIFOlist;
+                                        table.render(FIFOlistOption);
+
+                                        //console.log(result.data.list2);
+                                        var count = 0;
+                                        var count1 = 0;
+                                        for (var i = 0; i < result.data.Materlist.length; i++) {
+                                            count += result.data.Materlist[i].HQty;
+                                            count1 += result.data.Materlist[i].HPieceQty;
+                                        }
+                                        $("#HSumQtys").val(count);
+                                        $("#HBarCodeQtys").val(count1);
+                                        //return;
+                                    }
+                                    else {
+                                        layer.msg(result.Message);
+                                    }
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //#endregion
+
+
+            //#region 鎵弿鐗╂枡鏉＄爜
 
             //鎵潯鐮�
             $('#HBarCode').on('keydown', function (event) {
@@ -907,23 +1066,184 @@
                     GetMeesageByBarCode();
                 }
             });
+
             //纭畾
             form.on('submit(QueDin)', function (data) {
                 GetMeesageByBarCode();
             });
 
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+
+                var sInterID = $("#HInterID").val()
+                var HBillType = '1207';
+                var sBillNo = $("#HBillNo").val()
+                var sMaker = $("#HMaker").val();//鍒跺崟浜�
+                var WhID = $("#HWHID").val()//璋冨叆浠撳簱
+                var SPID = $("#HStockPlaceID").val()//璋冨叆浠撲綅
+                var HSCWhID = $("#HSCWHID").val()//璋冨嚭浠撳簱
+                var HSCSPID = $("#HOutStockPlaceID").val()//璋冨嚭浠撲綅
+                var sQty = $("#HQty").val()
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
+                if (sSourceBillNo == null) {
+                    sSourceBillNo = "";
+                }
+                var sHBillType = $("#HBillType").val()
+                var HStockInOrgID = $("#HStockInOrgID").val()//璋冨叆缁勭粐
+                var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+                var HScanStyle = "";
+
+                //鍒ゆ柇鏉＄爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+
+                if (HDeleteFlag == "*") {
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/ProductIn/Delete_Json",
+                            async: true,
+                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": '1207', "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    $.ajax({
+                                        url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                        type: "GET",
+                                        data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+                                        success: function (result) {
+                                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                                listOption.data = result.data.Materlist;
+                                                table.render(listOption);
+                                                FIFOlistOption.data = result.data.FIFOlist;
+                                                table.render(FIFOlistOption);
+
+                                                //console.log(result.data.list2);
+                                                var count = 0;
+                                                var count1 = 0;
+                                                for (var i = 0; i < result.data.Materlist.length; i++) {
+                                                    count += result.data.Materlist[i].HQty;
+                                                    count1 += result.data.Materlist[i].HPieceQty;
+                                                }
+                                                $("#HSumQtys").val(count);
+                                                $("#HBarCodeQtys").val(count1);
+                                                //return;
+                                            }
+                                            else {
+                                                layer.msg(result.Message);
+                                            }
+                                            layer.closeAll("loading");
+                                        }
+                                    });
+                                    playSound1();
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                }
+                else {
+                    if ($("#HBillNo").val() == '') {
+                        playSound();
+                        layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    if ($("#HInterID").val() == '') {
+                        playSound();
+                        layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    var sBarCode = $('#HBarCode').val()
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    if (sQty != "") {
+                        $('#HQty').val("");
+                    }
+                    $.ajax({
+                        url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
+                        type: "GET",
+                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": WhID, "HSPID": SPID, "HSCWHID": HSCWhID, "HSCSPID": HSCSPID, "HQty": sQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                if (HSourceFlag == "false") {
+                                    $("#HBillType").find("option:contains('鎵嬪伐褰曞叆')").attr("selected", true);
+                                    $("#HSourceBillNo").val("");
+
+                                    $("#HStockStyle").attr("disabled", "disabled");
+                                    $("#HStockInOrgName").attr("readonly", "readonly");
+                                    $("#HStockOutOrgName").attr("readonly", "readonly");
+                                    $("#HBillType").attr("disabled", "disabled");
+                                    $("#HSourceBillNo").attr("readonly", "readonly");
+                                    form.render('select');
+                                }
+                                HSourceFlag = true;
+                                element.tabChange('tab-MoveStockBill', '3');
+
+                                layer.load(3)
+                                $.ajax({
+                                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                    type: "GET",
+                                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            listOption.data = result.data.Materlist;
+                                            table.render(listOption);
+                                            FIFOlistOption.data = result.data.FIFOlist;
+                                            table.render(FIFOlistOption);
+
+                                            //console.log(result.data.list2);
+                                            var count = 0;
+                                            var count1 = 0;
+                                            for (var i = 0; i < result.data.Materlist.length; i++) {
+                                                count += result.data.Materlist[i].HQty;
+                                                count1 += result.data.Materlist[i].HPieceQty;
+                                            }
+                                            $("#HSumQtys").val(count);
+                                            $("#HBarCodeQtys").val(count1);
+                                            //return;
+                                        }
+                                        else {
+                                            layer.msg(result.Message);
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                                playSound1();
+                            }
+                            else {
+                                playSound();
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            }
+
+            //#endregion
+
+
             
 
-            //鎵簮鍗�
-            $('#HSourceBillNo').on('keydown', function (event) {      //鎵簮鍗�
-                if (event.keyCode == 13) {
-                    GetMeesageBySourceBillNo();
-                }
-            });
-            //纭畾
-            form.on('submit(QueDin2)', function (data) {
-                GetMeesageBySourceBillNo();
-            });
 
             $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
                 var HBarCode = $('#HStockPlaceName').val()
@@ -975,6 +1295,82 @@
                 }
             });
 
+
+            //#region 鍒犻櫎鍔熻兘鎺т欢
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+                        var sInterID = $("#HInterID").val()
+                        var sBillNo = $("#HBillNo").val()
+                        var sMaterID = data[0].HMaterID
+                        var sAuxPropID = data[0].HAuxPropID
+                        var sMTONo = ''
+                        var sSourceInterID = data[0].HSourceInterID
+                        var sSourceEntryID = data[0].HSourceEntryID
+                        var HBillType = '1207';
+                        var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+                                async: true,
+                                data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        //鏄剧ず琛ㄤ綋鏄庣粏
+                                        $.ajax({
+                                            url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                            type: "GET",
+                                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+                                            success: function (result) {
+                                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                                    listOption.data = result.data.Materlist;
+                                                    table.render(listOption);
+                                                    FIFOlistOption.data = result.data.FIFOlist;
+                                                    table.render(FIFOlistOption);
+
+                                                    //console.log(result.data.list2);
+                                                    var count = 0;
+                                                    var count1 = 0;
+                                                    for (var i = 0; i < result.data.Materlist.length; i++) {
+                                                        count += result.data.Materlist[i].HQty;
+                                                        count1 += result.data.Materlist[i].HPieceQty;
+                                                    }
+                                                    $("#HSumQtys").val(count);
+                                                    $("#HBarCodeQtys").val(count1);
+                                                    //return;
+                                                }
+                                                else {
+                                                    layer.msg(result.Message);
+                                                }
+                                                layer.closeAll("loading");
+                                            }
+                                        });
+                                    }
+                                    else {
+                                        layer.msg(data.Message, { icon: 2 });
+                                    }
+                                },
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, {
+                                        icon: 5,
+                                        time: 20000
+                                    }, function () {
+                                    });
+                                }
+                            });
+                        layer.close(index)
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                }
+            });
+            //#endregion
+
             table.render({
                 elem: '#mx-table'
                 // , url: GetWEBURL() + '/MoveStockBill/GetHBarCodeShowBillSub'
@@ -1008,225 +1404,6 @@
                 }
             });
 
-            //鎵潯鐮�
-            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
-                var sOldBarCode = $('#HBarCode').val()
-                var HDeleteFlag = sOldBarCode.substring(0, 1);
-                var sBarCode = sOldBarCode.slice(1);
-
-                var sSubStr = table.cache['wl-table'];
-                //var sBarCode = $('#HBarCode').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var sQty = $("#HQty").val()
-                var sHBillType = $("#HBillType").val()
-                var HSCWhID = $("#HSCWHID").val()//璋冨嚭浠撳簱
-                var HSCSPID = $("#HOutStockPlaceID").val()//璋冨嚭浠撲綅
-                var SPID = $("#HStockPlaceID").val()//璋冨叆浠撲綅
-                var WhID = $("#HWHID").val()//璋冨叆浠撳簱
-                var sMaker = $("#HMaker").val();//鍒跺崟浜�
-                var HOrgID = $("#HOrgID").val();//缁勭粐
-                var HBillType = '1207';
-                var sMouldManagerCtl = 'N'
-                var sFIFOCtl = 'N'
-                var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
-                if (sSourceBillNo == null) {
-                    sSourceBillNo = "";
-                }
-                var HScanStyle = "";
-                var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
-                var HStockInOrgID = $("#HStockInOrgID").val()//璋冨叆缁勭粐
-                if (sQty == "") {
-                    sQty = 0;
-                }
-
-                //if (WhID == HSCWhID)
-                //{
-                //    layer.msg("璋冨叆浠撳簱璺熻皟鍑轰粨搴撲竴鑷达紝璇烽噸鏂伴�夋嫨璋冨叆浠撳簱鎴栬�呰皟鍑轰粨搴�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //    return false;
-                //}
-
-                if (HDeleteFlag == "*") {
-                    if (sBarCode != "") {
-                        $('#HBarCode').val("");
-                    }
-                    $.ajax(
-                        {
-                            type: "Get",
-                            url: GetWEBURL() + "/ProductIn/Delete_Json",
-                            async: true,
-                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": '1207', "HBarCode": sBarCode },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                    playSound1();
-                                    table.render({
-                                        elem: '#wl-table'
-                                        , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
-                                        , toolbar: '#toolbarDemo'
-                                        , totalRow: true
-                                        , defaultToolbar: []
-                                        , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
-                                        , cols: [[
-                                            { type: 'radio' }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
-                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
-                                            , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                                            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                            , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                                            , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                                            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                                            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                            , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                                        ]]
-                                        // , data: [linterid]
-                                        // , page: true
-                                        , height: 500
-                                        , done: function () {
-                                            layer.closeAll("loading");
-                                        }
-                                    })
-                                }
-                                else {
-                                    playSound();
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                            },
-                            error: function (err) {
-                                playSound();
-                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        });
-                }
-                else {
-                    var sBarCode = $('#HBarCode').val()
-                    if (sBarCode != "") {
-                        $('#HBarCode').val("");
-                    }
-                    if (sQty != "") {
-                        $('#HQty').val("");
-                    }
-                    if ($("#HWHNAME").val() == '') {
-                        playSound();
-                        layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                    //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
-                    //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    //    return false;
-                    //}
-                    //if ($("#HSCWHNAME").val() == '') {
-                    //    layer.msg("璋冨嚭浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    //    return false;
-                    //}
-                    if ($("#HBillNo").val() == '') {
-                        playSound();
-                        layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                    if ($("#HInterID").val() == '') {
-                        playSound();
-                        layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                    $.ajax({
-                        url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",//37181
-                        type: "GET",
-                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
-                        success: function (result) {
-                            if (result.count == 1) {
-                                sessionStorage["SourceFlag"] = true;
-                                element.tabChange('tab-MoveStockBill', '3');
-                                //$("#HWHNAME").attr("readOnly", "true");//璋冨叆浠撳簱涓嶅彲鍙�
-                                //$("#HWHID-BT").attr("disabled", "true");
-                                //$("#HStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
-                                //$("#HSpID-BT").attr("disabled", "true");
-                                //$("#HSCWHNAME").attr("readOnly", "true");//璋冨嚭浠撳簱涓嶅彲鍙�
-                                //$("#HSCWHID-BT").attr("disabled", "true");
-                                //$("#HOutStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
-                                //$("#HOSpID-BT").attr("disabled", "true");
-                                layer.load(3)
-                                //table.render({
-                                //    elem: '#wl-table'
-                                //    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
-                                //    , toolbar: '#toolbarDemo'
-                                //    , defaultToolbar: []
-                                //    , totalRow: true
-                                //    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
-                                //    , cols: [[
-                                //        { type: 'radio', totalRowText: '鍚堣' }
-                                //        , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
-                                //        , { field: '浠舵暟', title: '浠舵暟', width: 150, totalRow: true }
-                                //        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                //        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                                //        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                //        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                //        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                                //        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                                //        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                                //        , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                //        , { field: 'HMaterID', title: '鐗╂枡鍐呯爜', width: 150, hide: true }
-                                //        , { field: 'HAuxPropID', title: '', width: 150, hide: true }
-                                //        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 150, hide: true }
-                                //        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                                //    ]]
-                                //    // , data: [linterid]
-                                //    // , page: true
-                                //    //, height: 500
-                                //    , done: function () {
-                                //        layer.closeAll("loading");
-                                //    }
-                                //});
-
-                                $.ajax({
-                                    url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
-                                    type: "GET",
-                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
-                                    success: function (result) {
-                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                            listOption.data = result.data.list;
-                                            table.render(listOption);
-                                            listOption1.data = result.data.list2;
-                                            table.render(listOption1);
-
-                                            //console.log(result.data.list2);
-                                            var count = 0;
-                                            var count1 = 0;
-                                            for (var i = 0; i < result.data.list.length; i++) {
-                                                count += result.data.list[i].HQty;
-                                                count1 += result.data.list[i].HPieceQty;
-                                            }
-                                            $("#HSumQtys").val(count);
-                                            $("#HBarCodeQtys").val(count1);
-                                            //return;
-                                        }
-                                        else {
-                                            layer.msg(result.Message);
-                                        }
-                                        layer.closeAll("loading");
-                                    }
-                                });
-
-
-                                playSound1();
-                                var sSubStr = table.cache['wl-table'];
-                            }
-                            else {
-                                playSound();
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                            layer.closeAll("loading");
-                        }
-                        //,
-                        //error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        //    alert("璇锋眰瀵硅薄XMLHttpRequest: " + XMLHttpRequest);
-                        //    alert("閿欒绫诲瀷textStatus: " + textStatus);
-                        //    alert("寮傚父瀵硅薄errorThrown: " + errorThrown);
-                        //}
-                    });
-                }
-            }
             function playSound() {
                 console.log("playSound");
                 //var audio = document.getElementById("cs");
@@ -1247,115 +1424,6 @@
                 var audio = document.getElementById("cs2");
                 audio.play();
             }
-            //鎵簮鐮�
-            function GetMeesageBySourceBillNo(obj) {  //杩斿洖宸ヤ綔涓績
-                var HSourceBillNo = $('#HSourceBillNo').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var HSourceBillType = $("#HBillType").val()
-                var sMouldManagerCtl = 'N'
-                var sFIFOCtl = 'N'
-                var HBillType = '1207'
-                $.ajax({
-                    url: GetWEBURL() + "/MoveStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                    type: "GET",
-                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            playSound1();
-                            HSourceFlag = true;
-                            if (result.data[0].HSourceBillType == '1243') {
-                                $("#HStockStyle").val(result.data[0].HStockStyle);
-                                $("#HStockInOrgID").val(result.data[0].HSTOCKINORGID);
-                                $("#HStockInOrgName").val(result.data[0].HSTOCKINORGName);
-                                $("#HStockOutOrgID").val(result.data[0].HSTOCKOUTORGID);
-                                $("#HStockOutOrgName").val(result.data[0].HSTOCKOUTORGName);
-                            }
-
-                            //$("#HDeptID").val(result.data[0].HDeptID);
-                            //$("#HDeptName").val(result.data[0].HDeptName);
-
-
-                            $("#HWHID").val(result.data[0].HWhID);
-                            $("#HWHNAME").val(result.data[0].HWhName);
-
-                            //if (!DBUtility.ClsPub.ObjToBool(DS.Tables[0].Rows[0]["HIsStockMgr"])) {
-                            //    $("#HStockPlaceName").Enabled = false;
-                            //    $("#HStockPlaceID").Enabled = false;
-                            //}
-                            //else {
-                            //    $("#HStockPlaceName").Enabled = true;
-                            //    $("#HStockPlaceID").Enabled = true;
-                            //}
-                            layer.load(3);
-                            element.tabChange('tab-MoveStockBill', '2');
-                            //table.render({
-                            //    elem: '#wl-table'
-                            //    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
-                            //    , toolbar: '#toolbarDemo'
-                            //    , totalRow: true
-                            //    , defaultToolbar: []
-                            //    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
-                            //    , cols: [[
-                            //        { type: 'radio' }
-                            //        , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
-                            //        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
-                            //        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                            //        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                            //        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                            //        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                            //        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                            //        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                            //        , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                            //        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                            //    ]]
-                            //    // , data: [linterid]
-                            //    // , page: true
-                            //    , height: 500
-                            //    , done: function () {
-                            //        layer.closeAll("loading");
-                            //    }
-                            //});
-
-                            $.ajax({
-                                url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
-                                type: "GET",
-                                data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
-                                success: function (result) {
-                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                        listOption.data = result.data.list;
-                                        table.render(listOption);
-                                        listOption1.data = result.data.list2;
-                                        table.render(listOption1);
-
-                                        //console.log(result.data.list2);
-                                        var count = 0;
-                                        var count1 = 0;
-                                        for (var i = 0; i < result.data.list.length; i++) {
-                                            count += result.data.list[i].HQty;
-                                            count1 += result.data.list[i].HPieceQty;
-                                        }
-                                        $("#HSumQtys").val(count);
-                                        $("#HBarCodeQtys").val(count1);
-                                        //return;
-                                    }
-                                    else {
-                                        layer.msg(result.Message);
-                                    }
-                                    layer.closeAll("loading");
-                                }
-                            });
-
-                            $("#HSourceBillNo").attr("disabled", "true");
-                        }
-                        else {
-                            playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-            }
             
         });
 
@@ -1373,12 +1441,36 @@
             , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
             , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
             , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-            , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-            , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+            , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
             , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-            , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+            , { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
+            , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150, hide: true }
+            , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
+            , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
+            , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
+            , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
             , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        }
+        var FIFOlistOption = {
+            elem: '#FIFOlist-table'
+            , toolbar: '#toolbarDemo'
+            , cellMinWidth: 90
+            , limit: 3000
+            , totalRow: true
+            , cols: [[
+                { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+                , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 150, totalRow: true }
+                , { field: 'HWhName', title: '浠撳簱', width: 150 }
+                , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
             ]]
             , height: 500
             , done: function () {
@@ -1409,6 +1501,12 @@
         }
 
         //浠ヤ笂涓簂ayui妯″潡
+        
+        function GetHFIFOWHNAMEValue(obj)  //杩斿洖鍏堣繘鍏堝嚭浠撳簱
+        {
+            $("#HFIFOWHNAME").val(obj[0].HName);
+            $("#HFIFOWHID").val(obj[0].HItemID);
+        }
         function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
         {
             $("#HWHNAME").val(obj[0].HName);
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/Add_Edit_Gy_Department.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/Add_Edit_Gy_Department.html"
index cee5cd5..3a70b1c 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/Add_Edit_Gy_Department.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/Add_Edit_Gy_Department.html"
@@ -332,7 +332,7 @@
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
-                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
index b2bb764..1d91aec 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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
@@ -716,7 +716,7 @@
                 layer.open({
                     type: 2
                     , area: ['90%', '90%']//澶у皬
-                    , title: '宸ョ鍒楄〃'
+                    , title: '璁￠噺鍗曚綅缁勫垪琛�'
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
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/Add_Edit_Gy_Unit.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/Add_Edit_Gy_Unit.html"
index 353fd12..b4e497a 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/Add_Edit_Gy_Unit.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/Add_Edit_Gy_Unit.html"
@@ -68,7 +68,7 @@
                                                 <div class="layui-col-xs4">
                                                     <label class="layui-form-label"> 榛樿鍗曚綅:</label>
                                                     <div class="layui-input-inline">
-                                                        <input type="radio" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" value="true" title="">
+                                                        <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" value="true" title="">
                                                         <input type="hidden" value="false" name="HStandard" id="HStandard">
                                                     </div>
                                                 </div>
@@ -160,10 +160,14 @@
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data.h_v_Edit_Gy_UnitList[0];
                             console.log("杩斿洖鐨刣ata.HStopFlag" + JSON.stringify(data.绂佺敤鏍囪));
+                            console.log("杩斿洖鐨刣ata.HStandard" + JSON.stringify(data.榛樿鏍囪));
                             var IsHStopflag = data.绂佺敤鏍囪;
                             //绂佺敤鏍囪
                             if (IsHStopflag == "true") {
                                 $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            if (data.榛樿鏍囪 == "true") {
+                                $("input[name='checkboxHStandard'][value='" + data.榛樿鏍囪 + "']").attr("checked", true);
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HNumber": data.璁￠噺鍗曚綅浠ｇ爜
@@ -384,12 +388,13 @@
                     layer.msg("璇疯緭鍏ユ崲绠楁瘮渚嬶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+                var HRate = $("#HRate").val();
                 $.ajax(
                     {
                         type: "POST",
                         url: GetWEBURL() + "SaveGy_UnitList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         async: true,
-                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
+                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + HRate },
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
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/Add_Edit_Gy_Warehouse.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/Add_Edit_Gy_Warehouse.html"
index c54bf5f..f61b7c6 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/Add_Edit_Gy_Warehouse.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/Add_Edit_Gy_Warehouse.html"
@@ -342,7 +342,7 @@
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
-                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
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/Add_Edit_Xt_ORGANIZATIONSList.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/Add_Edit_Xt_ORGANIZATIONSList.html"
index a2f198c..3b4d183 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/Add_Edit_Xt_ORGANIZATIONSList.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/Add_Edit_Xt_ORGANIZATIONSList.html"
@@ -238,9 +238,10 @@
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data[0];
-                            var IsHStopflag = data.绂佺敤鏍囪;
+                            var IsHStopflag = data.绂佺敤鐘舵��;
                             //绂佺敤鏍囪
-                            if (IsHStopflag) {
+                            if (IsHStopflag == "鏄�") {
+                                IsHStopflag = true;
                                 $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -248,7 +249,7 @@
                                 , "HItemID": data.HItemID
                                 , "HName": data.缁勭粐鍚嶇О
                                 //, "HMakeTime": data.鏃ユ湡
-                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HStopflag": data.绂佺敤鐘舵��
                                 , "HRemark": data.澶囨敞
                             });
                             $("#HMakeTime").val(Format(data.鏃ユ湡, "yyyy-MM-dd"));
@@ -268,7 +269,7 @@
 
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
-                if (data.field.HStopflag) {
+                if (data.field.HStopflag == true) {
                     data.field.HStopflag = 1
                 } else  {
                     data.field.HStopflag = 0
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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
index fa440ef..0c073dd 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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
@@ -477,7 +477,7 @@
                                                 <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
                                                 <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;background-color:#CDCDCD">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.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/KF_BarCodeStatusChangeBill.html"
new file mode 100644
index 0000000..917ec54
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
@@ -0,0 +1,844 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏉＄爜鐘舵�佸彉鏇村崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div 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: 80px;">
+                                            </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="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
+                                                <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓氬姟鍛�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>-->
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁″垝鐢熶骇鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" style="width: 56%;">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(涓氬姟鐘舵��)-->
+    <script type="text/html" id="HSTATUS">
+        <select name="HSTATUS" lay-filter="HSTATUS" id="HSTATUS{{d.LAY_TABLE_INDEX+1}}">
+            <option value="1">璁″垝</option>
+            <option value="2">璁″垝纭</option>
+            <option value="3">涓嬭揪</option>
+            <option value="4">寮�宸�</option>
+            <option value="5">瀹屽伐</option>
+            <option value="6">缁撴</option>
+            <option value="7">缁撶畻</option>
+        </select>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laydate = layui.laydate
+            var option = [];
+
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            var rowdata = [{
+                "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
+                , "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
+                , "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
+            }];
+            //鍒濆鍖�
+            set_ClearBill();
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            if (linterid == null || linterid == 0) {
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3710' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+                //绂佺敤缁勭粐閫夐」
+                $("#HPRDORGID").attr("disabled", true);
+                $("#HDate").attr("disabled", true);
+                RoadBillMain(linterid);
+            }
+
+
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
+                    , "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
+                    , "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+                        //鍒锋柊澶嶉�夋
+                        checkRefresh();
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                        break;
+                    ////鍒楄缃�
+                    //case 'set_HideColumn':
+                    //    get_HideColumn();
+                    //    break;
+                }
+            });
+
+            //閫夋嫨閿�鍞鍗曞彿鎸夐挳
+            form.on('submit(btnHSeOrder)', function () {
+                get_btnHSeOrder();
+            });
+
+            //閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(btnHEmp)', function () {
+                get_btnHEmp();
+            });
+
+            //閫夋嫨瀹㈡埛鎸夐挳
+            form.on('submit(btnHCus)', function () {
+                get_btnHCus();
+            });
+
+            //閫夋嫨宸ヤ綔涓績鎸夐挳
+            form.on('submit(btnHCenter)', function () {
+                get_btnHCenter();
+            });
+
+
+            //琛岄�夋嫨澶勭悊锛堝伐搴忕被鍨嬶級
+            form.on('select(HSTATUS)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HSTATUS = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (OperationType == 1 && linterid != "") {
+                    Pub_Close(2);
+                } else {
+                    Pub_Close(1);
+                }
+            });
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_AddNew(data);
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                //#region 淇敼琛� 鏃堕棿
+
+                var data = obj.data;
+                //璁″垝寮�濮嬫棩鏈�
+                if (obj.event == 'HPlanBeginDate') {
+                    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 == 'HPlanEndDate') {
+                    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
+
+            });
+
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖� 缁勭粐
+                Organ();
+
+                set_InitGrid();
+            }
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPRDORGID").append(Organization);
+                            $("#HPRDORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[ //琛ㄥご
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                        , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
+                        , { field: 'HSourceID', title: 'HSourceID', hide: true }
+                        , { field: 'HSourceName', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" }//f7
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                        , { field: 'HDeptName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HDeptID" }//f7
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }//f7
+                        , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+                        , { field: 'HSTATUS', title: '涓氬姟鐘舵��', templet: "#HSTATUS" }
+                        , { field: 'HPlanBeginDate', title: '璁″垝寮�宸ユ棩鏈�', event: 'HPlanBeginDate' }
+                        , { field: 'HPlanEndDate', title: '璁″垝瀹屽伐鏃ユ湡', event: 'HPlanEndDate' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+
+                option.data = rowdata;
+                table.render(option);
+            }
+
+            //閿�鍞鍗�
+            function get_btnHSeOrder() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閿�鍞鍗�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HSeOrderInterID").val(checkStatus.data[0].hmainid);
+                        $("#HSeOrderBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HSeOrderEntryID").val(checkStatus.data[0].hsubid);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //涓氬姟鍛�
+            function get_btnHEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟鍛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //瀹㈡埛
+            function get_btnHCus() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HCusID").val(checkStatus.data[0].HItemID);
+                        $("#HCusName").val(checkStatus.data[0].HName);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //宸ヤ綔涓績
+            function get_btnHCenter() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ヤ綔涓績'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HCenterID").val(checkStatus.data[0].HItemID);
+                        $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽唴鍒犻櫎蹇嵎閿�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterNumber": checkStatus.data[0].HNumber
+                                        , "HMaterName": checkStatus.data[0].HName
+                                        , "HModel": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //鐢熶骇璧勬簮
+                        if (obj.event == "HSourceID") {
+                            //鎵撳紑浜哄憳琛�  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐢熶骇璧勬簮鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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({
+                                        "HSourceID": checkStatus.data[0].HItemID
+                                        , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //鐢熶骇杞﹂棿
+                        if (obj.event == "HDeptID") {
+                            //鎵撳紑浜哄憳琛�  灏忕獥浣�
+                            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({
+                                        "HDeptID": checkStatus.data[0].HItemID
+                                        , "HDeptName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //璁￠噺鍗曚綅
+                        if (obj.event == "HUnitID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璁￠噺鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HUnitName": checkStatus.data[0].HName
+                                        , "HUnitID": checkStatus.data[0].HItemID
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+
+            //澶氶��  鍒锋柊琛ㄦ牸
+            function checkRefresh() {
+                for (var i = 1; i <= option.data.length; i++) {
+                    //鏄惁鎵嬪伐鍏抽棴
+                    if (option.data[i - 1].HSTATUS) {
+                        $('#HSTATUS' + i + '').attr("checked", true);
+                    }
+                }
+                form.render('select');
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_ICMOBill/ICMOBillEdit",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + "  and hmainid='" + linterid + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //$("#HPRDORGID").val(d.data[0].HPRDORGID);
+                        //涓昏〃
+                        form.val("formData", {
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID":d.data[0].hmainid
+                            , "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+                            , "HSeOrderBillNo": d.data[0].婧愬崟鍗曞彿
+                            , "HSeOrderInterID": d.data[0].婧愬崟涓诲唴鐮�
+                            , "HSeOrderEntryID": d.data[0].婧愬崟瀛愬唴鐮�
+                            , "HEmpID": d.data[0].HEmpID
+                            , "HEmpName": d.data[0].涓氬姟鍛�
+                            , "HCenterID": d.data[0].HCenterID
+                            , "HCenterName": d.data[0].宸ヤ綔涓績
+                            , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            , "HPlanQty": d.data[0].璁″垝鐢熶骇鏁伴噺
+                            , "HPRDORGID": d.data[0].HPRDORGID
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < d.data.length; i++) {
+                            var HSTATUS = "";
+                            switch (d.data[i].鐘舵��) {
+                                case "璁″垝":
+                                    HSTATUS = "1";
+                                    break;
+                                case "璁″垝纭":
+                                    HSTATUS = "2";
+                                    break;
+                                case "涓嬭揪":
+                                    HSTATUS = "3";
+                                    break;
+                                case "寮�宸�":
+                                    HSTATUS = "4";
+                                    break;
+                                case "瀹屽伐":
+                                    HSTATUS = "5";
+                                    break;
+                                case "缁撴":
+                                    HSTATUS = "6";
+                                    break;
+                            }
+                            rowdata.push(
+                                {
+                                    "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].浜у搧浠ｇ爜, "HMaterName": d.data[i].浜у搧鍚嶇О
+                                    , "HModel": d.data[i].瑙勬牸鍨嬪彿, "HSourceID": d.data[i].HSourceID, "HSourceName": d.data[i].鐢熶骇璧勬簮
+                                    , "HDeptID": d.data[i].HDeptID, "HDeptName": d.data[i].鐢熶骇杞﹂棿, "HUnitID": d.data[i].HUnitID
+                                    , "HUnitName": d.data[i].璁￠噺鍗曚綅, "HQty": d.data[i].鐢熶骇浠诲姟鍗曟暟閲�, "HSTATUS": HSTATUS
+                                    , "HPlanBeginDate": Format(new Date(d.data[i].璁″垝寮�宸ユ棩鏈�), "yyyy-MM-dd"), "HPlanEndDate": Format(new Date(d.data[i].璁″垝瀹屽伐鏃ユ湡), "yyyy-MM-dd")
+                                }
+                            )
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
index 951803e..b7d5670 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
@@ -231,7 +231,7 @@
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">鎵瑰彿</label>
                                         </div>
                                         <div class="layui-col-xs8">
-                                            <input type="text" name="HBarchNo" id="HBarchNo" lay-verify="HBarchNo" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -755,8 +755,14 @@
                 if (HSPID == "") {
                     HSPID = 0;
                 }
+                if (HWHID == "") {
+                    HWHID = 0;
+                }
                 if (HSPNumber == "") {
                     HSPNumber = '';
+                }
+                if (HWHNumber == "") {
+                    HWHNumber = '';
                 }
 
                 //var sSourceType = $("#HBillType").val();
@@ -1018,7 +1024,7 @@
                     , cellMinWidth: 80
                     , totalRow: true
                     , url: GetWEBURL() + '/Kf_QCStockInCheckBill_Fast/BarCode_Json'
-                    , where: { HBarCode: sBarCode }
+                    , where: { HBarCode: sBarCode, HOrgID: sessionStorage["OrganizationID"] }
                     , cols: [[
                         { type: 'radio' }
                         , { field: 'HQty', title: '鏁伴噺', sort: true, width: 200 }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_SCStockInCheckBill_Fast.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_SCStockInCheckBill_Fast.html"
new file mode 100644
index 0000000..729646e
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_SCStockInCheckBill_Fast.html"
@@ -0,0 +1,1250 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>浜у搧妫�楠屽崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-table-cell {
+            height: auto;
+            white-space: normal;
+        }
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 5px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>浜у搧妫�楠屽崟</span>
+                    </div>
+                    <div class="layui-tab layui-col-xs12" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">婧愬崟淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鐗╂枡娓呭崟</li>
+                            <li lay-id="3" style="padding:1px;">鏄庣粏娓呭崟</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--婧愬崟淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <!--<div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <select name="HBillType" id="HBillType">
+                                                <option value="1103">鏀舵枡閫氱煡鍗�</option>
+                                            </select>
+                                        </div>
+                                    </div>-->
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡鏉＄爜</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:30px;padding-left:0px;display:none">鍒跺崟浜�</label>
+                                            </div>
+                                            <div class="layui-col-xs6">
+                                                <input type="text" name="HBillerID" id="HBillerID" lay-verify="HBillerID" autocomplete="off" class="layui-input">
+                                                <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+                                                <input type="hidden" name="HMakerID" id="HMakerID" lay-verify="HMakerID" value="0" autocomplete="off" class="layui-input" style="display : none">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0" autocomplete="off" class="layui-input" style="display : none">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                            </div>
+                                            <div class="layui-col-xs6">
+                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                            </div>
+                                            <div class="layui-col-xs3">
+                                                <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鐗╂枡娓呭崟-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                </div>
+                            </div>
+                            <!--鏄庣粏娓呭崟-->
+                            <div class="layui-tab-item">
+                                <!-- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>-->
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡浠ｇ爜</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HMaterID" id="HMaterID" lay-verify="HMaterID" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡鍚嶇О</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HMaterName" id="HMaterName" lay-verify="HMaterName" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">瑙勬牸鍨嬪彿</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HMaterModel" id="HMaterModel" lay-verify="HMaterModel" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曚綅</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HUnitName" id="HUnitName" lay-verify="HUnitName" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HUnitNumber" id="HUnitNumber" lay-verify="HUnitNumber" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">妫�楠屾暟閲�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HRightQty" id="HCheckQty" lay-verify="HCheckQty" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍚堟牸鏁伴噺</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HRightQty" id="HRightQty" lay-verify="HRightQty" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:70px;padding-left:0px;">涓嶅悎鏍兼暟閲�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HBadQty" id="HBadQty" lay-verify="HBadQty" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:30px;padding-left:0px;">璐ㄦ鍛�</label>
+                                            </div>
+                                            <div class="layui-col-xs6">
+                                                <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input">
+                                                <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+                                            </div>
+                                            <div class="layui-col-xs3">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperID-BT">...</button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">妫�楠岀粨鏋�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <select name="HCheckResult" id="HCheckResult">
+                                                <option value="1">鍚堟牸</option>
+                                                <option value="2">涓嶅悎鏍�</option>
+                                                <option value="3">淇濈暀</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">浣跨敤鍐崇瓥</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <select name="HUseResult" id="HUseResult">
+                                                <option value="A">鎺ユ敹</option>
+                                                <option value="B">璁╂鎺ユ敹</option>
+                                                <option value="E">鎸戦�夛紙鍏ㄦ锛�</option>
+                                                <option value="F">鍒ら��</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HWHName_B" id="HWHName_B" lay-verify="HWHName_B" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HWHNumber" id="HWHNumber" lay-verify="HWHNumber" autocomplete="off" class="layui-input" style="display : none">
+                                            <input type="text" name="HWHID" id="HWHID" lay-verify="HWHID" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSPName_B" id="HSPName_B" lay-verify="HSPName_B" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HSPNumber" id="HSPNumber" lay-verify="HSPNumber" autocomplete="off" class="layui-input" style="display : none">
+                                            <input type="text" name="HSPID" id="HSPID" lay-verify="HSPID" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">鎵瑰彿</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HBarchNo" id="HBarchNo" lay-verify="HBarchNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">璐ㄦ缁勭粐</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HZJOrgName" id="HZJOrgName" lay-verify="HZJOrgName" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HZJOrgNumber" id="HZJOrgNumber" lay-verify="HZJOrgNumber" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">渚涘簲鍟�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HSupNumber" id="HSupNumber" lay-verify="HSupNumber" autocomplete="off" class="layui-input" style="display : none">
+                                            <input type="text" name="HSupID" id="HSupID" lay-verify="HSupID" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;display:none">搴忓彿</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSeQ" id="HSeQ" lay-verify="HSeQ" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;display:none">婧愬崟涓籌D</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;display:none">婧愬崟瀛怚D</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;display:none">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;display:none">婧愬崟绫诲瀷</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;display:none">鏀舵枡鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSLInterID" id="HSLInterID" lay-verify="HSLInterID" autocomplete="off" class="layui-input" style="display : none">
+                                            <input type="text" name="HSLEntryID" id="HSLEntryID" lay-verify="HSLEntryID" autocomplete="off" class="layui-input" style="display : none">
+                                            <input type="text" name="HSLBillNo" id="HSLBillNo" lay-verify="HSLBillNo" autocomplete="off" class="layui-input" style="display : none">
+                                            <input type="text" name="HSLSeQ" id="HSLSeQ" lay-verify="HSLSeQ" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="JY">妫�楠�</a>
+    </script>
+
+
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            //娓呯┖鐣岄潰  new
+
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+            $("#HWHID").val(sessionStorage["HWHID"]);
+            $("#HWHNAME").val(sessionStorage["HWHName"]);
+            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMaker").hide();
+            $("#HMakerID").hide();
+            $("#HBillerID").val(sessionStorage["HBillerID"]);
+            $("#HBillerID").hide();
+            $("#HSTOCKORGID").val(sessionStorage["OrganizationID"]);
+            $("#HSTOCKORGID").hide();
+            var HSourceFlag = sessionStorage["SourceFlag"];
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            //鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetPonderationBill",
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (d) {
+                        // console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HBillType").val(d.data[0].HSourceBillType);
+                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+                        //$("#HWHID").val(d.data[0].HWhID);
+                        //$("#HKeeperID").val(d.data[0].HKeeperID);
+                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
+                        //$("#HDeptID").val(d.data[0].HDeptID);
+                        //$("#HBarCode").val(d.data[0].HBarCode);
+                        //$("#HQty").val(d.data[0].HQty);
+                        HSourceFlag = true;
+                        RoadSup();
+                    }
+                })
+            }
+            //鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
+            function RoadSup() {
+                //var sInterID = $("#HInterID").val()
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                if (HSourceBillNo == "" || sInterID <= 0) {
+                    layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                else {
+                    $.ajax({
+                        url: GetWEBURL() + "/POStockInBill/get_GetCg_POOrderBillList",
+                        type: "GET",
+                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HSupID").val(result.data[0].HSupID);
+                                $("#HSupName").val(result.data[0].HSupName);
+                                $("#HDeptID").val(result.data[0].HDeptID);
+                                $("#HDeptName").val(result.data[0].HDeptName);
+                                sessionStorage["SourceFlag"] = true;
+                                element.tabChange('tab-POStockInBill', '2');
+                                layer.load(3);
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            }
+            //鍔犺浇琛ㄤ綋
+            function RoadBillSub(linterid) {
+                table.render({
+                    elem: '#wl-table'
+                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                    , where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+                        , { field: 'HBatchNo', title: '鎵规', sort: true, width: 200 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
+                    //url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    type: "GET",
+                    data: { "HBillType": '7501' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+                RoadBillSub(linterid);
+                RoadSup();
+            }
+            //濡傛灉淇敼鍒欒蛋涓嬮潰 new
+
+
+
+
+            //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
+            if (1 == 2) {
+                element.tabChange('tab-POStockInBill', '3');
+                var pFocus = $("#HBarCode");
+                pFocus.focus();
+                pFocus.select();
+            }
+            else {
+                element.tabChange('tab-POStockInBill', '1');
+                var pFocus = $("#HSourceBillNo");
+                pFocus.focus();
+                pFocus.select();
+            }
+            //
+            ////閫夋嫨璋冨叆浠撳簱
+            form.on('submit(HWHID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨璋冨叆浠撲綅
+            form.on('submit(HSpID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨渚涘簲鍟�
+            form.on('submit(HSupID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '渚涘簲鍟嗗垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨淇濈
+            form.on('submit(HKeeperID-BT)', function () {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeper").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            //閫夋嫨鍙戣揣
+            form.on('submit(HSecManagerID-BT)', function (data) {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManager").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            //閫夋嫨閮ㄩ棬
+            form.on('submit(HDeptID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                parent.location.href = "../../../views/index.html"
+            })
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+            //鍒犻櫎
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                // console.log(data);
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '1201'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
+                var sMouldManagerCtl = 'N'
+                var sFIFOCtl = 'N'
+                $.ajax(
+                    {
+                        type: "Get",
+                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
+                        async: true,
+                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                $.ajax({
+                                    url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
+                                    type: "GET",
+                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            listOption.data = result.data.list;
+                                            table.render(listOption);
+                                            var count = 0;
+                                            var count1 = 0;
+                                            for (var i = 0; i < result.data.list.length; i++) {
+                                                count += result.data.list[i].HQty;
+                                                count1 += result.data.list[i].HPieceQty;
+                                            }
+                                            $("#HSumQtys").val(count);
+                                            $("#HBarCodeQtys").val(count1);
+                                            //return;
+                                        }
+                                        else {
+                                            layer.msg(result.Message);
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+            });
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //var sMainStr = JSON.stringify(data.field);
+                //var sSubStr = table.cache['wl-table'];
+                var HZJOrgNumber = $("#HZJOrgNumber").val();         //璐ㄦ缁勭粐浠ｇ爜
+                var HMaterNumber = $("#HMaterNumber").val();     //鐗╂枡浠ｇ爜
+                var HUnitNumber = $("#HUnitNumber").val();     //璁￠噺鍗曚綅浠ｇ爜
+                var HCheckQty = $("#HCheckQty").val();     //妫�楠屾暟閲�
+                var HRightQty = $("#HRightQty").val();     //鍚堟牸鏁伴噺
+                var HBadQty = $("#HBadQty").val();     //涓嶅悎鏍兼暟閲�
+                var HCheckResult = $("#HCheckResult").val();     //妫�楠岀粨鏋�
+                //璐ㄦ鐘舵�侀粯璁や负璁″垝
+                var HSupNumber = $("#HSupNumber").val();     //渚涘簲鍟嗕唬鐮�
+                var HWHNumber = $("#HWHNumber").val();     //浠撳簱浠ｇ爜
+                var HSPNumber = $("#HSPNumber").val();     //浠撲綅浠ｇ爜
+                var HUseResult = $("#HUseResult").val();     //浣跨敤鍐崇瓥
+                var HSeQ = $("#HSeQ").val();     //婧愬崟琛屽彿
+                var HSourceInterID = $("#HSourceInterID").val();     //閲囪喘璁㈠崟涓籌D
+                var HSourceEntryID = $("#HSourceEntryID").val();     //閲囪喘璁㈠崟瀛怚D
+                var HSourceBillNo = $("#HSourceBillNo").val();     //閲囪喘璁㈠崟鍗曞彿
+                var HWHID = $("#HWHID").val();     //浠撳簱ID
+                var HSPID = $("#HSPID").val();     //浠撲綅ID
+                var HSupID = $("#HSupID").val();     //渚涘簲鍟咺D
+                var HKeeperID = $("#HKeeperID").val();     //璐ㄦ鍛業D
+                var HMaterID = $("#HMaterID").val();     //璐ㄦ鍛業D
+                var HSourceBillType = $("#HSourceBillType").val();     //婧愬崟绫诲瀷
+                var HSLInterID = $("#HSLInterID").val();     //鏀舵枡閫氱煡鍗曚富ID
+                var HSLEntryID = $("#HSLEntryID").val();     //鏀舵枡閫氱煡鍗曞瓙ID
+                var HSLBillNo = $("#HSLBillNo").val();     //鏀舵枡閫氱煡鍗曞崟鍙�
+                var HSLSeQ = $("#HSLSeQ").val();     //鏀舵枡閫氱煡鍗曡鍙�
+
+                if (HBadQty == "") {
+                    HBadQty = 0;
+                }
+                if (HSPID == "") {
+                    HSPID = 0;
+                }
+                if (HSupID == "") {
+                    HSupID = 0;
+                }
+                if (HSeQ == "") {
+                    HSeQ = 0;
+                }
+                if (HSPNumber == "") {
+                    HSPNumber = '';
+                }
+
+                //var sSourceType = $("#HBillType").val();
+                if (AllowLoadData() != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "GET",
+                            //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            url: GetWEBURL() + "/SCStockInCheckBill/set_SaveSCStockInCheckBill_Json",
+                            async: true,
+                            data: {
+                                "HZJOrgNumber": HZJOrgNumber, "HMaterNumber": HMaterNumber, "HUnitNumber": HUnitNumber, "HCheckQty": HCheckQty, "HRightQty": HRightQty
+                                , "HBadQty": HBadQty, "HCheckResult": HCheckResult, "HSupNumber": HSupNumber, "HWHNumber": HWHNumber
+                                , "HUseResult": HUseResult, "HSeQ": HSeQ, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo
+                                , "user": sessionStorage["HUserName"], "HWHID": HWHID, "HSPID": HSPID, "HSupID": HSupID, "HKeeperID": HKeeperID
+                                , "HMaterID": HMaterID, "HSourceBillType": HSourceBillType, "HSLInterID": HSLInterID, "HSLEntryID": HSLEntryID, "HSLBillNo": HSLBillNo, "HSLSeQ": HSLSeQ 
+                            },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    sessionStorage["SourceFlag"] = false;
+                                    layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1,
+                                        skin: 'layui-layer-lan',
+                                        closeBtn: 0,
+                                        btn: ['纭'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            //window.location.reload();//鏂板
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }
+                                        , function () { parent.location.href = "../../../views/index.html"; }//鏂板
+                                    );
+                                }
+                                else {
+                                    //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                                layui.form.render();
+                            },
+                            error: function (err) {
+                                //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    return false;
+                }
+            });
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                var sQty = $("#HQty").val();
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageBySourceBillNo();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
+            });
+
+
+
+            //鎵粨浣�
+            $('#HStockPlaceName').on('keydown', function (event) {
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HWHNAME").val(result.data[0].HWhName);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+                }
+            });
+            //鍒锋柊鏄庣粏椤电
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+
+            //鎵玀ES浠撲綅
+            $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HMESSPName').val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                $("#HMESSPID").val(result.data[0].HWHID);
+                                $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+                                $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+                                $.ajax({
+                                    url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+                                    type: "GET",
+                                    data: { "HERPWHID": result.data[0].HWHID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            $("#HWHID").val(result.data[0].HMESWHID);
+                                            $("#HWHNAME").val(result.data[0].HMESWHNAME);
+                                            $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+                                            $("#HMESSPName").css("background-color", "#efefef4d");
+                                        }
+                                        else {
+                                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+
+            table.on('tool(wl-table)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴妫�楠�
+
+            });
+
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'JY') {
+                    var linterid = data.HSourceInterID;
+                    var lentryid = data.HSourceEntryID;
+                    element.tabChange('tab-POStockInBill', '3');
+                    $.ajax({
+                        url: GetWEBURL() + '/SCStockInCheckBill/DisBillEntryList_Webs_New_Json2',
+                        type: "GET",
+                        data: { HInterID: linterid, HEntryID: lentryid},
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                listOption.data = result.data.list;
+                                //table.render(listOption);
+                                $("#HMaterNumber").val(result.data[0].HMaterNumber);
+                                $("#HMaterName").val(result.data[0].HMaterName);
+                                $("#HMaterModel").val(result.data[0].HMaterModel);
+                                $("#HUnitName").val(result.data[0].HUnitName);
+                                $("#HWHName_B").val(result.data[0].HWHName_B);
+                                $("#HSPName_B").val(result.data[0].HSPName_B);
+                                $("#HBatchNo").val(result.data[0].HBatchNo);
+                                $("#HZJOrgName").val(result.data[0].HZJOrgName);
+                                $("#HZJOrgNumber").val(result.data[0].HZJOrgNumber);
+                                $("#HSupName").val(result.data[0].HSupName);
+                                $("#HUnitNumber").val(result.data[0].HUnitNumber);
+                                $("#HSupNumber").val(result.data[0].HSupNumber);
+                                $("#HWHNumber").val(result.data[0].HWHNumber);
+                                $("#HSPNumber").val(result.data[0].HSPNumber);
+                                $("#HSeQ").val(result.data[0].HSeQ);
+                                $("#HSourceInterID").val(result.data[0].HSourceInterID);
+                                $("#HSourceEntryID").val(result.data[0].HSourceEntryID);
+                                $("#HSourceBillNo").val(result.data[0].HSourceBillNo);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HSPID").val(result.data[0].HSPID);
+                                $("#HSupID").val(result.data[0].HSupID);
+                                $("#HMaterID").val(result.data[0].HMaterID);
+                                $("#HSourceBillType").val(result.data[0].HSourceBillType);
+                                $("#HSLInterID").val(result.data[0].HSLInterID);
+                                $("#HSLEntryID").val(result.data[0].HSLEntryID);
+                                $("#HSLBillNo").val(result.data[0].HSLBillNo);
+                                $("#HSLSeQ").val(result.data[0].HSLSeQ);
+                            }
+                            else {
+                                layer.msg(result.Message);
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹楠岋紒');
+                }
+            }
+
+
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sBarCode = $('#HBarCode').val()
+               
+
+               
+
+                //鍒ゆ柇鏉＄爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (sBarCode != "") {
+                    $('#HBarCode').val("");
+                }
+                element.tabChange('tab-POStockInBill', '2');
+                table.render({
+                    elem: '#wl-table'
+                    , cellMinWidth: 80
+                    , totalRow: true
+                    , url: GetWEBURL() + '/Kf_SCStockInCheckBill_Fast/BarCode_Json1'
+                    , where: { HBarCode: sBarCode, HOrgID: sessionStorage["OrganizationID"]}
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', sort: true, width: 200 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+                        , { field: 'HBatchNo', title: '鎵规' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                    // , data: [linterid]
+                    // , page: true
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+               
+            }
+            var listOption = {
+                elem: '#wl-table'
+                , toolbar: '#toolbarDemo'
+                , totalRow: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HSNO', title: '搴忓彿', width: 60 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                    , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            }
+            function playSound() {
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+            function playSound1() {
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                if (HSourceBillNo == "" || sInterID <= 0) {
+                    layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                //
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    type: "GET",
+                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $("#HSupID").val(result.data[0].HSupID);
+                            $("#HSupName").val(result.data[0].HSupName);
+                            sessionStorage["SourceFlag"] = true;
+                            layer.load(3);
+                            element.tabChange('tab-POStockInBill', '2');
+
+                            table.render({
+                                elem: '#wl-table'
+                                , cellMinWidth: 80
+                                , totalRow: true
+                                //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
+                                , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                                //, toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
+                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+                                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+                                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+                                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+                                    , { field: 'HBatchNo', title: '鎵规' }
+                                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                                ]]
+                                // , data: [linterid]
+                                // , page: true
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+        {
+            $("#HWHNAME").val(obj[0].HName);
+            //sessionStorage["HWHID"] = obj[0].HItemID;
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+            $("#HStockPlaceName").val(obj[0].HName);
+            $("#HStockPlaceID").val(obj[0].HItemID);
+            $("#HWHNAME").val(obj[0].HWhName);
+            $("#HWHID").val(obj[0].HWHID);
+        }
+        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+            $("#HSupName").val(obj[0].HName);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHKeeperValue(obj) {  //杩斿洖淇濈
+            $("#HKeeper").val(obj[0].HName);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+            $("#HSecManager").val(obj[0].HName);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+            //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+            var reg = /^\d+(\.\d+)?$/;
+            //if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+            //    layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if (reg.test($("#Qty_B").val()) == false || $("#Qty_B").val() == '') {
+            //    layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HSourceBillNo").val() == '') {
+            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HDeptName").val() == '') {
+            //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HSecManager").val() == '') {
+            //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HKeeper").val() == '') {
+            //    layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HSupName").val() == '') {
+            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+            //    return false;
+            //}
+            //if ($("#HWHNAME").val() == '') {
+            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //if (typeof (sSubStr) == "undefined") {
+            //    //layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+            //    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            if (bnt == 'Saver') {
+                //if (!typeof (sSubStr) == "undefined") {
+                //    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                //    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                //    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                //    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                //    //            return false;
+                //    //        }
+                //    //    }
+                //    //}
+                //    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                //        if (parseFloat(sSubStr[i].HQty) > 0) {
+                //            s = 1;
+                //        }
+                //    }
+                //    if (s == 0) {
+                //        layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //        return false;
+                //    }
+                //}
+            }
+            else {
+                return true;
+            }
+        }
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 6668d14..c1f32ad 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -1235,6 +1235,8 @@
             //鍏ュ簱
             form.on('submit(btn-RK)', function (data) {
                 var BillNo = $("#HBillNo").val();
+
+
                 $.ajax({
                     type: "GET",
                     url: GetWEBURL() + "/Sc_ProcessMangement/SaveProcdutInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index eebcec0..75da5ce 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -49,13 +49,14 @@
                     </div>
                     <div class="layui-tab" lay-filter="tab-Kf_OtherOutBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1">婧愬崟淇℃伅</li>
-                            <li lay-id="2">鍗曟嵁淇℃伅</li>
-                            <li lay-id="3">鐗╂枡娓呭崟</li>
-                            <li lay-id="4">鏃ュ織</li>
+                            <li lay-id="1">閫夋嫨婧愬崟</li>
+                            <li lay-id="2">琛ㄥご淇℃伅</li>
+                            <li lay-id="3">鏄庣粏淇℃伅</li>
+                            <li lay-id="4" style="padding:1px;">涓嬫灦淇℃伅</li>
+                            <li lay-id="5">鍚堣淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
-                            <!--婧愬崟淇℃伅-->
+                            <!--閫夋嫨婧愬崟-->
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item">
                                     <div class="layui-row">
@@ -65,6 +66,7 @@
                                         <div class="layui-col-xs8">
                                             <select name=" HBillType" id="HBillType">
                                                 <option value="-1">鎵嬪伐褰曞叆</option>
+                                                <option value="1242">鍑哄簱鐢宠鍗�</option>
                                             </select>
                                         </div>
                                     </div>
@@ -93,12 +95,26 @@
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs2">
-                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">閫夋嫨</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" id="HFIFOWHID-BT" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            <!--鍗曟嵁淇℃伅-->
+                            <!--琛ㄥご淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
@@ -196,11 +212,15 @@
                                     </div>
                                 </div>
                             </div>
-                            <!--鐗╂枡娓呭崟-->
+                            <!--鏄庣粏淇℃伅-->
                             <div class="layui-tab-item">
                                 <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                             </div>
-                            <!--鏃ュ織-->
+                            <!--涓嬫灦淇℃伅-->
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="FIFOlist-table" lay-filter="FIFOlist-table"></table>
+                            </div>
+                            <!--鍚堣淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-row">
                                     <div class="layui-col-xs3">
@@ -234,7 +254,17 @@
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
                         </div>
-                </form>
+                        <div id="" style="display:none;">
+                            <audio id="cs" hidden controls>
+                                <source src="../../video/jingbao.wav" type="audio/ogg">
+                            </audio>
+                        </div>
+                        <div id="" style="display:none;">
+                            <audio id="cs2" hidden controls>
+                                <source src="../../video/success.wav" type="audio/ogg">
+                            </audio>
+                        </div>
+</form>
             </div>
         </div>
     </div>
@@ -254,6 +284,8 @@
                 , table = layui.table
                 , form = layui.form
                 , element = layui.element;
+            var HStockOrgID = sessionStorage["OrganizationID"]
+            var HSourceFlag = sessionStorage["SourceFlag"];
 
 
             //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
@@ -308,6 +340,7 @@
                         $("#HBillNo").val(d.data[0].HBillNo);
                         $("#HBillType").val(d.data[0].HSourceBillType);
                         $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+                        HSourceFlag = true;
                         //$("#HWHID").val(d.data[0].HWhID);
                         //$("#HKeeperID").val(d.data[0].HKeeperID);
                         //$("#HSecManagerID").val(d.data[0].HSecManagerID);
@@ -401,6 +434,22 @@
                     // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
                 }
             });
+            //閫夋嫨鍏堣繘鍏堝嚭浠撳簱
+            form.on('submit(HFIFOWHID-BT)', function () {//閫夋嫨璋冨嚭浠撳簱
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HFIFOWHID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
             form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
                 layer.open({
                     type: 2
@@ -409,10 +458,9 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
                     , resize: false
                     , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
             });
@@ -542,13 +590,33 @@
                 })
             });
 
+            //閫�鍑烘寜閽�
             form.on('submit(Cancel)', function () {
-                sessionStorage["SourceFlag"] = false;
-                //parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    window.close();
-                });
+                var sInterID = $("#HInterID").val()
+                var HBillType = '1206'
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
+                        async: true,
+                        data: { "HInterID": sInterID, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, {
+                                icon: 5,
+                                time: 20000
+                            }, function () {
+                            });
+                        }
+                    });
+                parent.location.href = "../../../views/index.html"
             })
 
             form.on('submit(cmdModify)', function () {//缂栬緫
@@ -573,62 +641,73 @@
             form.on('submit(cmdDelete)', function () {//鍒犻櫎
                 var checkStatus = table.checkStatus('wl-table')
                     , data = checkStatus.data;
-                // console.log(data);
-                var sInterID = $('#HInterID').val()
-                var sMaterID = data[0].HMaterID
-                var sBillType = '1206'
-                var sAuxPropID = data[0].HAuxPropID
-                //var sMTONo = data[0].HMTONo
-                var sMTONo = ''
-                var sSourceInterID = data[0].HSourceInterID
-                var sSourceEntryID = data[0].HSourceEntryID
-                $.ajax(
-                    {
-                        type: "Get",
-                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        url: GetWEBURL() + "/OtherOutBill/Delete_Json",
-                        async: true,
-                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                //layer.msg(data.Message, { icon: 1 });
-                                table.render({
-                                    elem: '#wl-table'
-                                    , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
-                                    , cellMinWidth: 80
-                                    , toolbar: '#toolbarDemo'
-                                    , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
-                                    , cols: [[
-                                        { type: 'radio' }
-                                        , { field: 'HQty', title: '閲嶉噺', width: 150 }
-                                        , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
-                                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
-                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
-                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
-                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
-                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                                        , { field: 'HBatchNo', title: '鎵规', width: 100 }
-                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
-                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
-                                    ]]
-                                    , height: 500
-                                })
-                            }
-                            else {
-                                layer.msg(data.Message, { icon: 2 });
-                            }
-                        },
-                        error: function (err) {
-                            layer.msg('閿欒' + err, {
-                                icon: 5,
-                                time: 20000
-                            }, function () {
-                                //do something
+                if (checkStatus.data.length === 1) {
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+                        var sInterID = $("#HInterID").val()
+                        var sBillNo = $("#HBillNo").val()
+                        var sMaterID = data[0].HMaterID
+                        var sAuxPropID = data[0].HAuxPropID
+                        var sMTONo = ''
+                        var sSourceInterID = data[0].HSourceInterID
+                        var sSourceEntryID = data[0].HSourceEntryID
+                        var HBillType = '1206';
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+                                async: true,
+                                data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        //鏄剧ず琛ㄤ綋鏄庣粏
+                                        $.ajax({
+                                            url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                            type: "GET",
+                                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+                                            success: function (result) {
+                                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                                    listOption.data = result.data.Materlist;
+                                                    table.render(listOption);
+                                                    FIFOlistOption.data = result.data.FIFOlist;
+                                                    table.render(FIFOlistOption);
+
+                                                    //console.log(result.data.list2);
+                                                    var count = 0;
+                                                    var count1 = 0;
+                                                    for (var i = 0; i < result.data.Materlist.length; i++) {
+                                                        count += result.data.Materlist[i].HQty;
+                                                        count1 += result.data.Materlist[i].HPieceQty;
+                                                    }
+                                                    $("#HSumQtys").val(count);
+                                                    $("#HBarCodeQtys").val(count1);
+                                                    //return;
+                                                }
+                                                else {
+                                                    layer.msg(result.Message);
+                                                }
+                                                layer.closeAll("loading");
+                                            }
+                                        });
+                                    }
+                                    else {
+                                        layer.msg(data.Message, { icon: 2 });
+                                    }
+                                },
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, {
+                                        icon: 5,
+                                        time: 20000
+                                    }, function () {
+                                    });
+                                }
                             });
-                        }
-                    });
+                        layer.close(index)
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                }
             });
 
 
@@ -673,21 +752,8 @@
                     //}
                 }
             });
-            //鏉″舰鐮佸洖杞︽柟娉�
-            $('#HBarCode').on('keydown', function (event) {
-                var sQty = $("#HQty").val();
-                if (sQty == "") {
-                    sQty = 0;
-                }
-                if (event.keyCode == 13) {
-                    GetMeesageByBarCode();
-                }
-            });
-            //纭畾
-            form.on('submit(QueDin)', function (data) {
-                GetMeesageByBarCode();
-            });
 
+            //#region 鎵弿婧愬崟鏉＄爜
 
             //鎵簮鍗�
             $('#HSourceBillNo').on('keydown', function (event) {
@@ -695,32 +761,107 @@
                     GetMeesageBySourceBillNo();
                 }
             });
+
             //纭畾
             form.on('submit(QueDin2)', function (data) {
                 GetMeesageBySourceBillNo();
             });
 
-           
+            //鎵弿婧愬崟鏉＄爜
+            function GetMeesageBySourceBillNo(obj) {
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HBillType = '1206'
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var HSourceBillType = $("#HBillType").val()
+                var HMaker = sessionStorage["HUserName"]
+                var HFIFOWhID = $("#HFIFOWHID").val()
+                $.ajax({
+                    url: GetWEBURL() + "/WEBSController/get_SourceBarCode_OtherOut_Json",
+                    type: "GET",
+                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": HFIFOWhID, "HOWNERID": HStockOrgID },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            playSound1();
+                            HSourceFlag = true;
+                            if (result.data.hDeptIDField != 0) {
+                                $("#HDeptID").val(result.data.hDeptIDField);
+                                $("#HDeptName").val(result.data.hDeptNameField);
+                            }
+                            $("#HSourceBillNo").val(result.data.hSourceBillNoField);
 
-            table.render({
-                elem: '#mx-table'
-                // , url: 'http://localhost:8083/OtherOutBill/GetHBarCodeShowBillSub'
-                //, toolbar: '#toolbarDemo'
-                // , where: { sMsg: linterid, sMsg2: lentryid }
-                , cols: [[
-                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-                ]]
-                , page: true
-                , height: 500
-                , done: function () {
+                            $("#HBillType").attr("disabled", "disabled");
+                            form.render('select');
+                            if (result.data.hMulSourceFlagField == 0) {
+                                $("#HSourceBillNo").attr("readonly", "readonly");
+                            }
+                            layer.load(3);
+                            element.tabChange('tab-Kf_OtherOutBill', '2');
+
+                            $.ajax({
+                                url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                type: "GET",
+                                data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+                                success: function (result) {
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        listOption.data = result.data.Materlist;
+                                        table.render(listOption);
+                                        FIFOlistOption.data = result.data.FIFOlist;
+                                        table.render(FIFOlistOption);
+
+                                        //console.log(result.data.list2);
+                                        var count = 0;
+                                        var count1 = 0;
+                                        for (var i = 0; i < result.data.Materlist.length; i++) {
+                                            count += result.data.Materlist[i].HQty;
+                                            count1 += result.data.Materlist[i].HPieceQty;
+                                        }
+                                        $("#HSumQtys").val(count);
+                                        $("#HBarCodeQtys").val(count1);
+                                        //return;
+                                    }
+                                    else {
+                                        layer.msg(result.Message);
+                                    }
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //#endregion
+
+
+            //#region 鎵弿鐗╂枡鏉＄爜
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
                 }
             });
-     
+
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
             //鎵潯鐮�
             function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
                 var sOldBarCode = $('#HBarCode').val()
                 var HDeleteFlag = sOldBarCode.substring(0, 1);
                 var sBarCode = sOldBarCode.slice(1);
+                if (sBarCode == null) {
+                    sBarCode = "";
+                }
+
                 var sInterID = $("#HInterID").val()
                 var sBillType = '1206'
                 var sBillNo = $("#HBillNo").val()
@@ -728,15 +869,22 @@
                 var sHWHID = $("#HWHID").val();//浠撳簱ID
                 var sHSPID = $("#HStockPlaceID").val();//浠撲綅ID
                 var sQty = $("#HQty").val()
-                var sHBillType = $("#HBillType").val()
-                var sSourceBillNo = $("#HSourceBillNo").val()
-                var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠＄悊
-                var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
-                var HScanStyle = $("#HScanStyle").val();
                 if (sQty == "") {
                     sQty = 0;
                 }
+                var sSourceBillNo = $("#HSourceBillNo").val()
+                if (sSourceBillNo == null) {
+                    sSourceBillNo = "";
+                }
+                var sHBillType = $("#HBillType").val()
+                var HScanStyle = $("#HScanStyle").val();
 
+                //鍒ゆ柇鏉＄爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
                 if (HDeleteFlag == "*") {
                     if (sBarCode != "") {
                         $('#HBarCode').val("");
@@ -821,25 +969,17 @@
                         });
                 }
                 else {
-
                     var sBarCode = $('#HBarCode').val()
-                    if (sBarCode == '') {
-                        playSound();
-                        layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                        return false;
-                        }
-
                     if (sBarCode != "") {
                         $('#HBarCode').val("");
                     }
                     if (sQty != "") {
                         $('#HQty').val("");
                     }
-                    sessionStorage["SourceFlag"] = false;
                     $.ajax({
-                        url: GetWEBURL() + "/OtherOutBill/get_CheckTypeByBarCode_Out_Json",
+                        url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                         type: "GET",
-                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle },
+                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": HStockOrgID, "HScanStyle": HScanStyle, "HCustom1": "", "HCustom2": "" },
                         success: function (result) {
                             if (result.count == 1) {
                                 if (result.data.HBarType == '浠撳簱鏉＄爜') {
@@ -882,77 +1022,35 @@
                                     element.tabChange('tab-Kf_OtherOutBill', '3');
                                 }
                                 else {
-                                    if (sessionStorage["SourceFlag"] == "true") {
-                                        element.tabChange('tab-Kf_OtherOutBill', '3');
-                                    }
-                                    else {
-                                        //$("#HSupName").val(result.data.HSupName);
-                                        //$("#HSupID").val(result.data.HSupID);
-                                        //$("#HDeptName").val(result.data.HDeptName);
-                                        //$("#HDeptID").val(result.data.HDeptID);
-                                        //$("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                        sessionStorage["SourceFlag"] = true;
-                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                        if (result.data.HSourceBillType == "1206") {
-                                            $("#HBillType").val("1206");
+                                    if (HSourceFlag == "false") {
+                                        $("#HBillType").find("option:contains('鎵嬪伐褰曞叆')").attr("selected", true);
+                                        $("#HSourceBillNo").val("");
 
-                                        }
-                                        else if (result.data.HSourceBillType == "1601") {
-                                            $("#HBillType").val("1601");
-                                        }
-                                        $("#HNote").val(";鐗╂枡鏉＄爜");
-                                        element.tabChange('tab-Kf_OtherOutBill', '3');
+                                        $("#HSourceBillNo").attr("readonly", "readonly");
+                                        $("#HBillType").attr("disabled", "disabled");
+                                        form.render('select');
                                     }
+                                    HSourceFlag = true;
+                                    element.tabChange('tab-Kf_OtherOutBill', '3');
                                 }
-                                //$("#HSupID").val(result.data.HSupID);
-                                //$("#HSupName").val(result.data.HSupName);
-                                //$("#HDeptID").val(result.data.HDeptID);
-                                //$("#HDeptName").val(result.data.HDeptName);
                                 layer.load(3)
-                                //table.render({
-                                //    elem: '#wl-table'
-                                //    //, url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
-                                //    ,url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1'
-                                //    , toolbar: '#toolbarDemo'
-                                //    //, where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
-                                //    ,data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
-                                //    , cellMinWidth: 90
-                                //    , cols: [[
-                                //        { type: 'radio' }
-                                //        , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                //        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                //        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                                //        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                //        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                //        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                                //        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                                //        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                                //        , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                //    ]]
-                                //    // , data: [linterid]
-                                //    // , page: true
-                                //    , height: 500
-                                //    , done: function () {
-                                //        layer.closeAll("loading");
-                                //    }
-                                //});
                                 $.ajax({
-                                    url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+                                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                     type: "GET",
-                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HStockOrgID": HStockOrgID },
                                     success: function (result) {
                                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                            listOption.data = result.data.list;
+                                            listOption.data = result.data.Materlist;
                                             table.render(listOption);
-                                            listOption1.data = result.data.list2;
-                                            table.render(listOption1);
+                                            FIFOlistOption.data = result.data.FIFOlist;
+                                            table.render(FIFOlistOption);
 
                                             //console.log(result.data.list2);
                                             var count = 0;
                                             var count1 = 0;
-                                            for (var i = 0; i < result.data.list.length; i++) {
-                                                count += result.data.list[i].HQty;
-                                                count1 += result.data.list[i].HPieceQty;
+                                            for (var i = 0; i < result.data.Materlist.length; i++) {
+                                                count += result.data.Materlist[i].HQty;
+                                                count1 += result.data.Materlist[i].HPieceQty;
                                             }
                                             $("#HSumQtys").val(count);
                                             $("#HBarCodeQtys").val(count1);
@@ -964,12 +1062,11 @@
                                         layer.closeAll("loading");
                                     }
                                 });
+                                playSound1();
                             }
                             else {
-                                // $("#verifycode").click();
-                                //layer.msg(result.Message, { icon: 5 });
                                 playSound();
-                                layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                             layer.closeAll("loading");
                         }
@@ -977,122 +1074,169 @@
                 }
             }
 
+            //#endregion
+
             var listOption = {
                 elem: '#wl-table'
                 , toolbar: '#toolbarDemo'
                 , cellMinWidth: 90
+                , limit: 3000
                 , totalRow: true
                 , cols: [[
                     { type: 'radio' }
-                    , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true }
-                    , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
-                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
                     , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
                     , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                    , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+                    , { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
+                    , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150, hide: true }
+                    , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
+                    , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
+                    , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
+                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
                 ]]
                 , height: 500
                 , done: function () {
                     layer.closeAll("loading");
                 }
             }
-            var listOption1 = {
-                elem: '#mx-table'
+            var FIFOlistOption = {
+                elem: '#FIFOlist-table'
                 , toolbar: '#toolbarDemo'
                 , cellMinWidth: 90
+                , limit: 3000
+                , totalRow: true
                 , cols: [[
-                    { type: 'radio' }
-                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
-                    , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 150 }
-                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+                    { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+                    , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 150, totalRow: true }
+                    , { field: 'HWhName', title: '浠撳簱', width: 150 }
+                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                    , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
-                    //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                    //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
                 ]]
                 , height: 500
                 , done: function () {
                     layer.closeAll("loading");
                 }
             }
+            //妫シ鍒楄〃鏄剧ず
+            //var listOption = {
+            //    elem: '#wl-table'
+            //    , toolbar: '#toolbarDemo'
+            //    , cellMinWidth: 90
+            //    , totalRow: true
+            //    , cols: [[
+            //        { type: 'radio' }
+            //        , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true }
+            //        , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
+            //        , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+            //        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+            //        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+            //        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+            //        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+            //        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+            //        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+            //        , { field: 'HBatchNo', title: '鎵规', width: 150 }
+            //        , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+            //    ]]
+            //    , height: 500
+            //    , done: function () {
+            //        layer.closeAll("loading");
+            //    }
+            //}
+
 
             function playSound() {
-                var audio = document.getElementById("cs");
-                if (audio == null)
-                    $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                console.log("playSound");
                 var audio = document.getElementById("cs");
                 audio.play();
             }
-            //鎵簮鍗�
-            function GetMeesageBySourceBillNo(obj) {
-                var HSourceBillNo = $('#HSourceBillNo').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠＄悊
-                var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
-                if (HSourceBillNo == "" || sInterID <= 0) {
-                    layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                //
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                    url: GetWEBURL() + "/OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                    type: "GET",
-                    data: { "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.load(3)
-                            table.render({
-                                elem: '#wl-table'
-                                // , url: 'http://61.130.49.162:9090/WMSAPI///OtherOutBill/DisBillEntryList_Webs_Json'
-                                , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1'
-                                , toolbar: '#toolbarDemo'
-                                , totalRow: true
-                                , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
-                                , cols: [[
-                                    { type: 'radio' }
-                                    , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true}
-                                    , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
-                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                    , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
-                                ]]
-                                // , data: [linterid]
-                                // , page: true
-                                , height: 500
-                                , done: function () {
-                                    layer.closeAll("loading");
-                                }
-                            });
-                        }
-                        else {
-                            // $("#verifycode").click();
-                            //layer.msg(result.Message, { icon: 5 });
-                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
+            function playSound1() {
+                console.log("playSound1");
+                var audio = document.getElementById("cs2");
+                audio.play();
             }
+
+            //function playSound() {
+            //    var audio = document.getElementById("cs");
+            //    if (audio == null)
+            //        $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+            //    var audio = document.getElementById("cs");
+            //    audio.play();
+            //}
+            ////鎵簮鍗�     鍘熻皟鐢ㄦ柟娉�
+            //function GetMeesageBySourceBillNo(obj) {
+            //    var HSourceBillNo = $('#HSourceBillNo').val()
+            //    var sInterID = $("#HInterID").val()
+            //    var sBillNo = $("#HBillNo").val()
+            //    var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠＄悊
+            //    var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
+            //    if (HSourceBillNo == "" || sInterID <= 0) {
+            //        layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //        return;
+            //    }
+            //    //
+            //    $.ajax({
+            //        //url: "http://61.130.49.162:9090/WMSAPI///OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+            //        url: GetWEBURL() + "/OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+            //        type: "GET",
+            //        data: { "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+            //        success: function (result) {
+            //            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+            //                layer.load(3)
+            //                table.render({
+            //                    elem: '#wl-table'
+            //                    // , url: 'http://61.130.49.162:9090/WMSAPI///OtherOutBill/DisBillEntryList_Webs_Json'
+            //                    , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1'
+            //                    , toolbar: '#toolbarDemo'
+            //                    , totalRow: true
+            //                    , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
+            //                    , cols: [[
+            //                        { type: 'radio' }
+            //                        , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true}
+            //                        , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
+            //                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+            //                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+            //                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+            //                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+            //                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+            //                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+            //                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+            //                        , { field: 'HBatchNo', title: '鎵规', width: 150 }
+            //                        , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+            //                    ]]
+            //                    // , data: [linterid]
+            //                    // , page: true
+            //                    , height: 500
+            //                    , done: function () {
+            //                        layer.closeAll("loading");
+            //                    }
+            //                });
+            //            }
+            //            else {
+            //                // $("#verifycode").click();
+            //                //layer.msg(result.Message, { icon: 5 });
+            //                layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+            //            }
+            //            layer.closeAll("loading");
+            //        }
+            //    });
+            //}
 
         });
 
         //浠ヤ笂涓篖ayUi妯″潡
+        function GetHFIFOWHNAMEValue(obj)  //杩斿洖鍏堣繘鍏堝嚭浠撳簱
+        {
+            $("#HFIFOWHNAME").val(obj[0].HName);
+            $("#HFIFOWHID").val(obj[0].HItemID);
+        }
         function GetHWHValue(obj)  //杩斿洖浠撳簱
         {
             $("#HWHNAME").val(obj[0].HName);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_CheckList_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_CheckList_New.html"
new file mode 100644
index 0000000..2146a59
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_CheckList_New.html"
@@ -0,0 +1,494 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐢熶骇琛ユ枡鏍￠獙缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_MateReplenishOutBill_CheckList">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2">宸蹭笂浼犳煡璇�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item  layui-show">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">婧愬崟鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">鏌ヨ</button>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>-->
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙ｆā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        //娓呯┖鐣岄潰  new
+        var HBillType = '1254'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]
+        var option = [];
+        var Uploadedoption = [];
+
+        set_ClearBill();
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            element.tabChange('tab-Kf_MateReplenishOutBill_CheckList', '1');
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#dj-table'
+                , height: 'full-50'
+                //, page: true
+                , cellMinWidth: 90
+                , limit: 50
+                //, limits: [50, 500, 5000, 20000]
+            };
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                , height: 'full-50'
+                //, page: true
+                , cellMinWidth: 90
+                , limit: 50
+                //, limits: [50, 500, 5000, 20000]
+            };
+        }
+
+        //#region 缂撳瓨鍒楄〃鐣岄潰    鎺т欢浜嬩欢
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            layer.open({
+                type: 2
+                , area: ['100%', '100%']
+                , title: '璋冩嫧鍗�'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html?linterid=' + data[0].HInterID, 'yes']
+                , resize: false
+                , cancel: function () {
+                    $(".layui-btn").removeClass("layui-btn-disabled");
+                }
+            })
+        });
+        //#endregion
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+        form.on('submit(cmdDelete)', function () {//鍒犻櫎
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                //閫昏緫鍒犻櫎鏂规硶
+                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+                    var sInterID = data[0].HInterID;
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/DeleteBillList_Json",
+                            async: true,
+                            data: { "HInterID": sInterID },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 2 });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, {
+                                    icon: 5,
+                                    time: 20000
+                                }, function () {
+                                });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+            }
+        });
+        //#endregion
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+        form.on('submit(cmdRefresh)', function () {//鍒锋柊
+            DisBillEntryList();
+            //table.render({
+            //    elem: '#dj-table'
+            //    , url: GetWEBURL() + '/Web/chanpinruk'
+            //    , toolbar: '#toolbarDemo'
+            //    , defaultToolbar: []
+            //    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            //    , cols: [[
+            //        { type: 'radio' }
+            //        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+            //        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+            //        , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+            //        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+            //        , { field: 'HQty', title: '鏁伴噺', width: 100 }
+            //        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+            //        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
+            //        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+
+            //    ]]
+            //    , height: 500
+            //    , done: function () {
+            //        layer.closeAll("loading");
+            //    }
+            //})
+        });
+
+        function DisBillEntryList() {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
+                type: "GET",
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (data1) {
+                    var col = [];
+                    if (data1.count == 1) {
+                        var data = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍒ゆ柇鏄惁鏄函鑻辨枃
+                        var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                        col.push({ type: 'radio' });
+                        for (var i = 0; i < data.length; i++) {
+                            if (!patrn.test(data[i].name)) {
+                                col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    case 'DateTime':
+                                        col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+                                }
+                            }
+                        }
+                        option.cols = [col];
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+        form.on('submit(cmdCancel)', function () {
+            parent.location.href = "../../../views/index.html"
+        })
+        //#endregion
+
+        //#region 鏂板鍔熻兘鎺т欢
+
+        //#endregion
+
+        //#endregion
+
+
+        //#region 宸蹭笂浼犳煡璇㈢晫闈�  鎺т欢浜嬩欢
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+        form.on('submit(cmdQuery)', function () {
+            DisUploadedList();
+
+            //var HBillNo = $("#HBillNo").val();
+            //var HSourceBillNo = $("#HSourceBillNo").val();;
+
+
+            //table.render({
+            //    elem: '#Uploaded-table'
+            //    , url: GetWEBURL() + '/ProductInBillList/list1'
+            //    , toolbar: '#toolbarDemo'
+            //    , defaultToolbar: []
+            //    , where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
+            //    , cols: [[
+            //        { type: 'radio' }
+            //        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+            //        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+            //        , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+            //        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+            //        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+            //        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+            //        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+            //        , { field: 'HQty', title: '鏁伴噺', width: 100 }
+            //        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+            //        , { field: 'HOrgID', title: '缁勭粐', width: 120 }
+            //    ]]
+            //    , height: 500
+            //    , done: function () {
+            //        layer.closeAll("loading");
+            //    }
+            //})
+        });
+
+        function DisUploadedList() {
+            var HBillNo = $("#HBillNo").val();
+            var HSourceBillNo = $("#HSourceBillNo").val();
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                type: "GET",
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (data1) {
+                    var col = [];
+                    if (data1.count == 1) {
+                        var data = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍒ゆ柇鏄惁鏄函鑻辨枃
+                        var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                        col.push({ type: 'radio' });
+                        for (var i = 0; i < data.length; i++) {
+                            if (!patrn.test(data[i].name)) {
+                                col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    case 'DateTime':
+                                        col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+                                }
+                            }
+                        }
+                        Uploadedoption.cols = [col];
+                        Uploadedoption.data = data1.data;
+                        table.render(Uploadedoption);
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        //鎾ら攢鍔熻兘
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table');
+            var data = "";
+            if (checkStatus.data.length != 0) {
+                data = checkStatus.data;
+            } else {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+            }
+            var sInterID = data[0].HInterID
+            var sBillNo = data[0].HBillNo
+            var sBillType = '1207'
+            $.ajax(
+                {
+                    type: "Get",
+                    url: GetWEBURL() + "/Web/Rescind_Json",
+                    async: true,
+                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                // 寰楀埌frame绱㈠紩
+                                var index = layer.getFrameIndex(window.name);
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                window.location.reload();
+                            });
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 2 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, {
+                            icon: 5,
+                            time: 20000
+                        }, function () {
+                            //do something
+                        });
+                    }
+                });
+        });
+        //#endregion
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        //#endregion
+
+        //#endregion
+
+
+       
+        
+        
+                table.render({
+                    elem: '#dj-table'
+                    , url: GetWEBURL() + '/Web/chanpinruk'
+                    , toolbar: '#toolbarDemo'
+                    , defaultToolbar: []
+                    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+                        , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                        ]]
+                      , height: 500
+                      , done: function () {
+                          layer.closeAll("loading");
+                      }
+                })
+
+
+        //宸蹭笂浼犳煡璇�
+        table.render({
+            elem: '#Uploaded-table'
+            , toolbar: '#toolbarDemo'
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                , { field: 'HOrgID', title: '缁勭粐', width: 120 }
+            ]]
+            , height: 500
+        })
+        //鍒锋柊鏄庣粏椤电
+        table.render({
+            elem: '#mx-table' 
+            //, toolbar: '#toolbarDemo'
+            // , where: { sMsg: linterid, sMsg2: lentryid }
+         , cols: [[
+           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+         ]]
+         , page: true
+         , height: 500
+         , done: function () {
+         }
+        });
+    });
+    //娓呯┖琛ㄥご
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
index 456c4f9..66a1f9d 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
@@ -8,6 +8,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <style>
         .layui-col-xs4 {
             width: 12.333333%
@@ -62,7 +66,6 @@
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
                                             <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
-                                            <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                         </div>
                                         <div class="layui-col-xs3">
                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
@@ -89,10 +92,10 @@
                                             <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input mobile">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" value=""  autocomplete="off" class="layui-input mobile">
                                         </div>
                                         <div class="layui-col-xs3">
-                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0"  disabled="disabled" autocomplete="off" class="layui-input mobile">
                                         </div>
                                     </div>
                                 </div>
@@ -108,7 +111,7 @@
                                         <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜鏁�</label>
                                     </div>
                                     <div class="layui-col-xs8 layui-input-inline mobile">
-                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" autocomplete="off" class="layui-input">
+                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-row">
@@ -123,7 +126,7 @@
                             <div class="layui-form-item" style="margin-bottom: 20px;">
                                 <div class="layui-row">
                                     <div class="layui-col-xs3">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver" id="Saver">鎻愪氦</button>
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">鎻愪氦</button>
                                     </div>
                                     <div class="layui-col-xs3">
                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
@@ -132,7 +135,7 @@
                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
                                     </div>
                                     <div class="layui-col-xs3">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
                                     </div>
                                 </div>
                             </div>
@@ -141,10 +144,6 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -157,6 +156,38 @@
                 , table = layui.table
                 , form = layui.form
                 , element = layui.element;
+            var HBillType = '1254'
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]
+            var HInterID = $('#HInterID').val()
+            var HBillNo = $('#HBillNo').val()
+            var option = [];
+
+            set_ClearBill();
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '1');
+                var pFocus = $("#HBillNo");
+                pFocus.focus();     //鑾峰彇鍏夋爣
+                pFocus.select();
+
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+            }
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#wl-table'
+                    , height: 'full-50'
+                    //, page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    //, limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
 
             //鑾峰彇鍙傛暟
             function getUrlVars() {
@@ -173,13 +204,22 @@
             var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
             var lBillNo = params[params[1]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
 
-            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡锛岃幏鍙栧崟鎹俊鎭�
-            function RoadBillMain(linterid)
-            {
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+            }
+            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+            else {
+                RoadBillMain(linterid);
+            }
+
+            //#region 浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡锛岃幏鍙栧崟鎹俊鎭�
+            function RoadBillMain(linterid) {
                 $.ajax({
                     url: GetWEBURL() + "/WEBSController/GetSourceBillList_BillCheck_Json",
                     type: "GET",
-                    data: { "HBillNo": lBillNo, "HBillType": '1254'},
+                    data: { "HBillNo": lBillNo, "HBillType": '1254' },
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
                             $("#HWHID").val(result.data.hWhIDField);
@@ -190,31 +230,9 @@
                             $('#HBillNo').val(result.data.hBillNoField)
                             var HBillID = $('#HInterID').val()
                             element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');
-                            table.render({
-                                elem: '#wl-table'
-                                , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
-                                , toolbar: '#toolbarDemo'
-                                , where: { HBillID: HBillID, HBillType: '1254', sWhere: '' }
-                                , cellMinWidth: 90
-                                , cols: [[
-                                    { type: 'radio' }
-                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
-                                    , { field: 'HWHName', title: '浠撳簱', width: 150 }
-                                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
-                                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
-                                    , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
-                                ]]
-                                , height: 500
-                                , done: function () {
-                                    layer.closeAll("loading");
-                                }
-                            });
+
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
                         }
                         else {
                         }
@@ -222,21 +240,213 @@
                     }
                 });
             }
+            //#endregion
 
-            //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
-                $("#HInterID").val("");
-                $("#HBillNo").val("");
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                }
+            });
+
+            function playSound() {
+                var audio = document.getElementById("cs");
+                if (audio == null)
+                    $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                var audio = document.getElementById("cs");
+                audio.play();
             }
-            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
-            else {
-                RoadBillMain(linterid);
+            function playSound1() {
+                var audio = document.getElementById("cs2");
+                audio.play();
             }
 
-            element.tabChange('tab-Kf_MateReplenishOutBillCheck', '1');
-            var pFocus = $("#HBillNo");
-            pFocus.focus();     //鑾峰彇鍏夋爣
-            pFocus.select();
+            //#endregion
+
+
+            //#region 鎵弿鍗曟嵁鍙锋潯鐮�
+            $('#HBillNo').on('keydown', function (event) {
+                HBillNo = $('#HBillNo').val()
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
+                        type: "GET",
+                        data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID},
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HWHID").val(result.data.hWhIDField);
+                                $("#HWHNAME").val(result.data.hWhNameField);
+                                $("#HStockPlaceID").val(result.data.hSPIDField);
+                                $("#HStockPlaceName").val(result.data.hSPNameField);
+
+                                //if (result.data.hSPFlagField == false) {
+                                //    $("#HStockPlaceName").attr("readonly", "readonly");
+                                //    $("#HSpID-BT").attr("disabled", "disabled");
+                                //    //document.getElementById("HSpID-BT").disabled = false;
+                                //}
+                                //else {
+                                //    $("#HStockPlaceName").removeAttr("readonly");
+                                //    $("#HSpID-BT").removeAttr("disabled", "disabled");
+                                //}
+
+                                $('#HInterID').val(result.data.hInterIDField)
+                                $('#HBillNo').val(result.data.hBillNoField)
+                                $("#HBillNo").attr("readonly", "readonly");
+                                HInterID = $('#HInterID').val()
+                                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');
+
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+            //#endregion
+
+
+            //#region 鎵弿鐗╂枡鏉＄爜
+
+            //鎵爜鍥炶溅鏂规硶
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾鎸夐挳
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sQty = $("#HQty").val()
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                //鍒ゆ柇鏉＄爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (sBarCode != "") {
+                    $('#HBarCode').val("");
+                }
+                if (sQty != "") {
+                    $('#HQty').val("");
+                }
+                $.ajax({
+                    url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
+                    type: "GET",
+                    data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HStockOrgID": HStockOrgID },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            if (result.data.HBarType == '浠撳簱鏉＄爜') {
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                $("#HStockPlaceName").val("");
+                                $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+                                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');  //璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '浠撲綅鏉＄爜') {
+                                $("#HStockPlaceName").val(result.data.HSPName);
+                                $("#HStockPlaceID").val(result.data.HSPID);
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');//璺宠浆椤电
+                            }
+                            else {
+                                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
+                            }
+                            layer.load(3)
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //#endregion
+
+
+            //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+            function DisBillEntryList() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json',
+                    type: "GET",
+                    data: { "HInterID": HInterID, "HBillType": HBillType, "sWhere": '' },
+                    success: function (data1) {
+                        var col = [];
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            col.push({ type: 'radio' });
+                            for (var i = 0; i < data.length; i++) {
+                                if (!patrn.test(data[i].name)) {
+                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        case 'DateTime':
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+
+                            ////鍚堣姹囨��
+                            //var count = 0;
+                            //var count1 = 0;
+                            //for (var i = 0; i < data1.data.list.length; i++) {
+                            //    count += data1.data.list[i].HQty;
+                            //    count1 += data1.data.list[i].HPieceQty;
+                            //}
+                            //$("#HSumQtys").val(count);
+                            //$("#HBarCodeQtys").val(count1);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+
+            //#region 鍩虹璧勬枡閫夋嫨
+
+            //#region 浠撳簱璁剧疆
 
             form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
                 layer.open({
@@ -246,12 +456,17 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
                     , resize: false
                     , cancel: function () {
                     }
                 })
             });
+
+            //#endregion
+
+            //#region 浠撲綅璁剧疆
+
             form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
                 layer.open({
                     type: 2
@@ -267,97 +482,23 @@
                 })
             });
 
-            form.on('submit(Cancel)', function () {
-                sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-            })
+            //#endregion
 
-            form.on('submit(cmdModify)', function () {//缂栬緫
-                var sSubStr = table.cache['wl-table'];
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '鏄庣粏鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
-                    , resize: false
-                    , cancel: function () {
-                    }
-                })
-            });
-
-            form.on('submit(cmdDelete)', function () {//鍒犻櫎
-                var checkStatus = table.checkStatus('wl-table')
-                    , data = checkStatus.data;
-                var sInterID = $('#HInterID').val()
-                var sMaterID = data[0].HMaterID
-                var sBillType = '1254'
-                var sAuxPropID = data[0].HAuxPropID
-                var sMTONo = ''
-                var sSourceInterID = data[0].HSourceInterID
-                var sSourceEntryID = data[0].HSourceEntryID
-                $.ajax(
-                    {
-                        type: "Get",
-                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
-                        async: true,
-                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": sBillType, },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                table.render({
-                                    elem: '#wl-table'
-                                    , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
-                                    , toolbar: '#toolbarDemo'
-                                    , where: { HBillID: HBillID, HBillType: '1205', sWhere: '' }
-                                    , cellMinWidth: 90
-                                    , cols: [[
-                                        { type: 'radio' }
-                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                        , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                        , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
-                                        , { field: 'HWHName', title: '浠撳簱', width: 150 }
-                                        , { field: 'HSPName', title: '浠撲綅', width: 150 }
-                                        , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
-                                        , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
-                                    ]]
-                                    , height: 500
-                                    , done: function () {
-                                        layer.closeAll("loading");
-                                    }
-                                });
-                            }
-                            else {
-                                layer.msg(data.Message, { icon: 2 });
-                            }
-                        },
-                        error: function (err) {
-                            layer.msg('閿欒' + err, {
-                                icon: 5,
-                                time: 20000
-                            }, function () {
-                            });
-                        }
-                    });
-            });
+            //#endregion
 
 
+            //#region 鍔熻兘鎺т欢
 
-            //鎻愪氦涓婁紶鍗曟嵁
-            form.on('submit(Saver)', function (data) {
-                //鐏板害鎻愪氦鎸夐挳Saver
+            //#region 涓婁紶鍔熻兘鎺т欢
+
+            //#region 鎻愪氦涓婁紶鍗曟嵁
+            form.on('submit(cmdSaver)', function (data) {
+                //鐏板害鎻愪氦鎸夐挳cmdSaver
                 document.getElementById("Saver").disabled = true;
-                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+                data.field.HSTOCKORGID = HStockOrgID;//缁勭粐
                 var sMainStr = JSON.stringify(data.field);
                 var sMain = sMainStr;
                 var sSubStr = table.cache['wl-table'];
-                var sSourceType = $("#HBillType").val();
                 if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
                 {
                     layer.load(3);
@@ -379,212 +520,133 @@
                                 }
                                 else {
                                     layer.msg(data.Message, { icon: 5 });
-                                    //鐏板害鎻愪氦鎸夐挳Saver
+                                    //鐏板害鎻愪氦鎸夐挳cmdSaver
                                     document.getElementById("Saver").disabled = false;
                                 }
                                 layer.closeAll("loading");
                             },
                             error: function (err) {
                                 layer.msg("閿欒:" + err, { icon: 5 });
-                                //鐏板害鎻愪氦鎸夐挳Saver
-                                document.getElementById("Saver").disabled = false;
+                                //鐏板害鎻愪氦鎸夐挳cmdSaver
+                                document.getElementById("cmdSaver").disabled = false;
                             }
                         });
                 }
                 else {
                     layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
-                    //鐏板害鎻愪氦鎸夐挳Saver
+                    //鐏板害鎻愪氦鎸夐挳cmdSaver
                     document.getElementById("Saver").disabled = false;
                 }
             });
+            //#endregion
 
-
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                }
-            });
-
-            //鎵弿鍗曟嵁鍙锋潯鐮�
-            $('#HBillNo').on('keydown', function (event) {
-                var HBillNo = $('#HBillNo').val()
-                var HBillType = '1254'
-                if (event.keyCode == 13) {
-                    $.ajax({
-                        url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
-                        type: "GET",
-                        data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": sessionStorage["HUserName"], "HStockOrgID": sessionStorage["OrganizationID"]},
-                        success: function (result) {
-                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                $("#HStockPlaceName").val(result.data.hSPNameField);
-                                $("#HWHID").val(result.data.hWhIDField);
-                                $("#HWHNAME").val(result.data.hWhNameField);
-                                $('#HInterID').val(result.data.hInterIDField)
-                                $('#HBillNo').val(result.data.hBillNoField)
-                                $("#HBillNo").attr("readonly", "readonly");
-                                var HBillID = $('#HInterID').val()
-                                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');
-                                table.render({
-                                    elem: '#wl-table'
-                                    , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
-                                    , toolbar: '#toolbarDemo'
-                                    , where: { HBillID: HBillID, HBillType: HBillType, sWhere: '' }
-                                    , cellMinWidth: 90
-                                    , cols: [[
-                                        { type: 'radio' }
-                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                        , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                        , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
-                                        , { field: 'HWHName', title: '浠撳簱', width: 150 }
-                                        , { field: 'HSPName', title: '浠撲綅', width: 150 }
-                                        , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
-                                        , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
-                                    ]]
-                                    , height: 500
-                                    , done: function () {
-                                        layer.closeAll("loading");
-                                    }
-                                });
-                            }
-                            else {
-                                layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                            }
-                            layer.closeAll("loading");
-                        }
-                    });
-                }
-            });
-
-            //鏉″舰鐮佸洖杞︽柟娉�
-            $('#HBarCode').on('keydown', function (event) {
-                if (event.keyCode == 13) {
-                    GetMeesageByBarCode();
-                }
-            });
-            //纭畾
-            form.on('submit(QueDin)', function (data) {
-                GetMeesageByBarCode();
-            });
-
-
-            table.render({
-                elem: '#mx-table'
-                // , url: 'http://localhost:8083/OtherInStockBill/GetHBarCodeShowBillSub'
-                //, toolbar: '#toolbarDemo'
-                // , where: { sMsg: linterid, sMsg2: lentryid }
-                , cols: [[
-                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-                ]]
-                , page: true
-                , height: 500
-                , done: function () {
-                }
-            });
-            //鎵潯鐮�
-            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
-                var sSubStr = table.cache['wl-table'];
-                var sBarCode = $('#HBarCode').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var sQty = $("#HQty").val()
-                if (sQty == "") {
-                    sQty = 0;
-                }
-                var sHBillType = '1254'
-                var sHWHID = $("#HWHID").val()
-                var sHSPID = $("#HStockPlaceID").val()
-                var HOrgID = $("#HOrgID").val();//缁勭粐
-                //鍒ゆ柇鏉＄爜鏄惁涓虹┖  new
-                if (sBarCode == '') {
-                    playSound();
-                    layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //#region 涓婁紶鍓嶅垽鏂�
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
                     return false;
                 }
-                if (sBarCode != "") {
-                    $('#HBarCode').val("");
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹唴鐮�!", { icon: 5 });
+                    return false;
                 }
-                if (sQty != "") {
-                    $('#HQty').val("");
+                if (sSubStr == '' || sSubStr.length == 0) {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
+                    return false;
                 }
-                $.ajax({
-                    url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
-                    type: "GET",
-                    data: { "sBarCode": sBarCode, "HBillID": sInterID, "HBillType": sHBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HStockOrgID": sessionStorage["OrganizationID"] },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            if (result.data.HBarType == '浠撳簱鏉＄爜') {
-                                $("#HWHNAME").val(result.data.HWhName);
-                                $("#HWHID").val(result.data.HWhID);
-                                $("#HStockPlaceName").val("");
-                                $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
-                                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');  //璺宠浆椤电
-                            }
-                            else if (result.data.HBarType == '浠撲綅鏉＄爜') {
-                                $("#HStockPlaceName").val(result.data.HSPName);
-                                $("#HStockPlaceID").val(result.data.HSPID);
-                                $("#HWHNAME").val(result.data.HWhName);
-                                $("#HWHID").val(result.data.HWhID);
-                                $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
-                                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');//璺宠浆椤电
-                            }
-                            else {
-                                element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');
-                            }
-                            layer.load(3)
-                            table.render({
-                                elem: '#wl-table'
-                                , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
-                                , toolbar: '#toolbarDemo'
-                                , where: { HBillID: sInterID, HBillType: '1254', sWhere: '' }
-                                , cellMinWidth: 90
-                                , cols: [[
-                                    { type: 'radio' }
-                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
-                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
-                                    , { field: 'HWHName', title: '浠撳簱', width: 150 }
-                                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
-                                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
-                                    , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
-                                ]]
-                                , height: 500
-                                , done: function () {
-                                    layer.closeAll("loading");
-                                }
-                            });
+                if (sSubStr != '') {
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
                         }
-                        else {
-                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                        layer.closeAll("loading");
                     }
-                });
+                    if (s == 0) {
+                        layer.msg("鐢熶骇琛ユ枡璁板綍鏈壂鐮侊紒", { icon: 5 });
+                        return false;
+                    }
+                }
+                else {
+                    return true;
+                }
             }
+            //#endregion
 
-            function playSound() {
-                var audio = document.getElementById("cs");
-                if (audio == null)
-                    $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
-                var audio = document.getElementById("cs");
-                audio.play();
-            }
-            function playSound1() {
-                var audio = document.getElementById("cs2");
-                audio.play();
-            }
+            //#endregion
+
+            //#region 缂栬緫鍔熻兘鎺т欢
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                    }
+                })
+            });
+            //#endregion
+
+            //#region 鍒犻櫎鍔熻兘鎺т欢
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+                    var sMaterID = data[0].HMaterID
+                    var sAuxPropID = data[0].HAuxPropID
+                    var sMTONo = ''
+                    var sSourceInterID = data[0].HSourceInterID
+                    var sSourceEntryID = data[0].HSourceEntryID
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+                            async: true,
+                            data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    //鏄剧ず琛ㄤ綋鏄庣粏
+                                    DisBillEntryList();
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 2 });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, {
+                                    icon: 5,
+                                    time: 20000
+                                }, function () {
+                                });
+                            }
+                        });
+                        layer.close(index)
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                }
+            });
+            //#endregion
+
+            //#region 閫�鍑哄姛鑳芥帶浠�
+            form.on('submit(cmdCancel)', function () {
+                sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+            })
+            //#endregion
+
+            //#endregion
+
         });
         //浠ヤ笂涓� Layui妯″潡
+
         function GetHWHValue(obj)  //杩斿洖浠撳簱
         {
             $("#HWHNAME").val(obj[0].HName);
@@ -593,36 +655,6 @@
         function GetHSpValue(obj) {  //杩斿洖浠撲綅
             $("#HStockPlaceName").val(obj[0].HName);
             $("#HStockPlaceID").val(obj[0].HItemID);
-        }
-
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
-                return false;
-            }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹唴鐮�!", { icon: 5 });
-                return false;
-            }
-            if (sSubStr == '' || sSubStr.length == 0) {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
-                return false;
-            }
-            if (sSubStr != '') {
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
-                    }
-                }
-                if (s == 0) {
-                    layer.msg("鐢熶骇琛ユ枡璁板綍鏈壂鐮侊紒", { icon: 5 });
-                    return false;
-                }
-            }
-            else {
-                return true;
-            }
         }
     </script>
 
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_New.html"
index dddaf9b..9558a01 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_New.html"
@@ -246,7 +246,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
                     , resize: false
                     , cancel: function () {
                     }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 9d7ea7a..3d6954c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -971,10 +971,10 @@
                     //    }
                     //}
                     $.ajax({
-                        url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
+                        url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                         type: "GET",
                         async: false,
-                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                         success: function (result) {
                             if (result.count == 1) {
                                 playSound1();

--
Gitblit v1.9.1