From e5731626180db73f9e98bfda4c06d9aacf554df5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 30 三月 2026 11:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/生产管理/生产退库单/Sc_ProductionReturnList.html                    |   15 
 WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html                 |   51 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html                    |   14 
 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user                     |  158 +
 WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBillList.html                    |   24 
 WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html                        |   61 
 WebTM/views/基础资料/公用基础资料/Gy_Material.html                               |   42 
 WebTM/views/车间管理/单品过站_小卫/Cj_BarCodePrint.html                          |  527 ++++++
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                              |    3 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html              |   39 
 WebTM/views/模治具管理/上模单/Sc_MouldUpperBillList.html                       |   34 
 WebTM/views/质量管理/来料检验单/QC_POStockInCheckBillList.html                  |   28 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html                  |   38 
 WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html                          |   18 
 WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html                       |    7 
 WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html                          |   21 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html                 |   14 
 WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList_ICMO.html                  |   29 
 WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html                  |   36 
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html                              |   81 
 WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html               |   41 
 WebTM/views/基础资料/采购基础资料/Gy_Supplier2_JD.html                           |  516 ++++++
 WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html                  |   38 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html                     |   12 
 WebTM/layuiadmin/Scripts/webConfig.js                                  |    8 
 WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html                |   36 
 WebTM/views/设备管理/设备报表/Sb_EquipResumeCheckQuery.html                    |    2 
 WebTM/WebTM.csproj                                                     |    3 
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html                        |    4 
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html                          |   59 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkSN.html    |   72 
 WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html                     |   10 
 WebTM/views/模治具管理/器具报表/Sc_MouldMaintainBillMainReport.html             |   15 
 WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html                         |   10 
 WebTM/views/模治具管理/上模单/Sc_MouldLowerBillList.html                       |   36 
 WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillList.html          |   37 
 WebTM/views/模治具管理/器具报表/Sc_MouldConkBookBillMainReport.html             |   15 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillEdit.html                |   44 
 WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html                             |    3 
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill_HuaZhou.html                      | 2526 +++++++++++++++++++++++++++++
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillList.html              |   39 
 WebTM/WebTM.csproj.user                                                |    2 
 WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html                       |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html                  |   16 
 WebTM/views/领料发货/领料出库/Kf_MateOutBackBillList.html                      |  180 -
 WebTM/views/模治具管理/器具报表/Sc_MouldRepairWorkBillReport.html               |   14 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html |   19 
 WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html               |    1 
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html         |   13 
 WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillList.html            |   38 
 WebTM/views/基础资料/公用基础资料/Gy_ConkType.html                               |   36 
 51 files changed, 4,324 insertions(+), 763 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 852882a..2d82986 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.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|2026-03-11T13:10:16.4417106Z;False|2026-03-11T21:09:50.0199370+08:00;True|2026-03-06T13:02:30.1700626+08:00;False|2026-03-06T13:01:18.1921218+08:00;True|2026-03-04T10:20:16.4462648+08:00;False|2026-03-04T10:19:52.7213059+08:00;True|2026-03-03T09:01:55.3532585+08:00;False|2026-03-03T09:01:34.1180224+08:00;True|2026-03-02T17:54:01.0161175+08:00;True|2026-03-02T17:45:55.9591618+08:00;False|2026-03-02T17:44:40.3657472+08:00;True|2026-02-28T14:48:12.2214646+08:00;False|2026-02-28T14:47:57.2613147+08:00;True|2026-02-28T08:49:29.3709356+08:00;False|2026-02-28T08:49:10.2121819+08:00;True|2026-02-27T17:25:07.2604553+08:00;False|2026-02-27T17:24:38.7437638+08:00;False|2026-02-26T08:55:53.0918973+08:00;False|2026-02-25T15:53:33.2256623+08:00;True|2026-02-23T10:04:54.7226911+08:00;True|2026-02-23T09:57:05.9584101+08:00;False|2026-02-23T09:56:48.7304840+08:00;True|2026-02-02T15:19:54.4742719+08:00;True|2026-02-02T10:31:35.2889726+08:00;True|2026-02-02T10:30:22.0114186+08:00;True|2026-02-02T10:19:31.6468654+08:00;False|2026-02-02T10:19:07.6961464+08:00;True|2026-02-01T17:49:50.2373826+08:00;True|2026-02-01T17:43:45.8367335+08:00;True|2026-02-01T17:37:21.1681222+08:00;True|2026-02-01T17:30:44.8115393+08:00;True|2026-02-01T17:24:34.3543309+08:00;True|2026-02-01T15:55:00.9170790+08:00;False|2026-02-01T15:54:45.9715303+08:00;True|2026-01-30T16:00:15.7297670+08:00;True|2026-01-30T15:58:46.7261928+08:00;True|2026-01-30T15:55:26.3560928+08:00;True|2026-01-30T14:51:41.1899965+08:00;True|2026-01-30T10:44:51.1198066+08:00;False|2026-01-30T10:41:32.7181137+08:00;False|2026-01-29T12:26:43.1557204+08:00;True|2026-01-28T14:34:45.6195441+08:00;True|2026-01-28T12:04:43.8406153+08:00;True|2026-01-28T11:57:46.3318183+08:00;False|2026-01-28T11:57:33.6942821+08:00;False|2026-01-27T19:55:10.5020397+08:00;True|2026-01-22T16:26:15.4335521+08:00;False|2026-01-22T16:24:44.1639214+08:00;True|2026-01-21T12:44:50.7255065+08:00;True|2026-01-21T10:13:53.8661528+08:00;False|2026-01-21T10:13:30.3455869+08:00;True|2026-01-20T15:37:10.5876104+08:00;False|2026-01-20T15:36:09.6295896+08:00;True|2026-01-19T17:34:26.2575062+08:00;False|2026-01-19T17:34:01.4440031+08:00;True|2026-01-15T14:38:27.6246724+08:00;True|2026-01-15T14:32:18.8118329+08:00;False|2026-01-15T14:30:15.4333217+08:00;False|2026-01-15T14:30:03.1289160+08:00;False|2026-01-15T14:29:56.1941035+08:00;True|2026-01-09T14:06:08.1238984+08:00;False|2026-01-09T14:05:52.6015673+08:00;True|2026-01-07T17:42:56.5248615+08:00;False|2026-01-07T17:42:34.6924836+08:00;True|2026-01-05T16:12:27.5690710+08:00;True|2026-01-05T16:12:17.4425684+08:00;False|2026-01-05T16:12:03.0978959+08:00;True|2025-12-23T09:10:23.6893783+08:00;True|2025-12-23T09:07:26.6930977+08:00;False|2025-12-23T09:06:41.0915784+08:00;True|2025-12-23T08:40:29.7405628+08:00;False|2025-12-23T08:40:16.9341083+08:00;True|2025-12-22T17:42:46.9605488+08:00;True|2025-12-22T17:36:17.7159888+08:00;True|2025-12-22T17:24:39.2657970+08:00;False|2025-12-22T17:24:10.9683552+08:00;True|2025-12-22T17:11:32.7698140+08:00;True|2025-12-22T17:10:10.4453151+08:00;True|2025-12-22T17:09:26.6981581+08:00;True|2025-12-22T17:08:10.1973001+08:00;False|2025-12-22T17:08:00.4576327+08:00;True|2025-12-22T14:58:24.8825978+08:00;True|2025-12-22T14:54:31.0433963+08:00;True|2025-12-22T14:37:50.8363212+08:00;True|2025-12-22T14:29:14.1978041+08:00;True|2025-12-22T14:10:01.9969824+08:00;False|2025-12-22T14:09:36.1807155+08:00;True|2025-12-17T16:16:26.7825738+08:00;True|2025-12-17T16:15:16.0559691+08:00;True|2025-12-17T15:44:38.3317392+08:00;True|2025-12-17T10:19:06.7122186+08:00;False|2025-12-17T10:18:52.9280215+08:00;False|2025-12-12T09:23:50.5551285+08:00;True|2025-12-10T17:18:35.0298366+08:00;False|2025-12-10T17:18:13.1365696+08:00;True|2025-12-09T12:08:11.3908592+08:00;False|2025-12-09T12:07:58.5164793+08:00;True|2025-12-08T09:12:51.0932352+08:00;True|2025-12-08T09:10:41.2878088+08:00;True|2025-12-08T09:06:21.1445018+08:00;True|2025-12-08T09:04:37.3464741+08:00;True|2025-12-08T09:03:22.0422524+08:00;True|2025-12-08T08:58:24.8293057+08:00;True|2025-12-08T08:48:27.4588721+08:00;True|2025-12-08T08:43:56.2631642+08:00;True|2025-12-08T08:43:12.1755462+08:00;False|2025-12-08T08:42:46.8920155+08:00;True|2025-12-05T10:44:33.9514625+08:00;True|2025-12-05T10:32:48.6399523+08:00;False|2025-12-05T10:32:31.3728861+08:00;True|2025-12-04T16:24:38.4261651+08:00;True|2025-12-04T16:17:04.1081985+08:00;True|2025-12-04T16:13:49.5694236+08:00;True|2025-12-04T16:01:16.0391216+08:00;True|2025-12-04T16:00:53.6951993+08:00;True|2025-12-04T15:58:47.1517135+08:00;True|2025-12-04T15:42:30.5816099+08:00;True|2025-12-04T15:36:28.0075855+08:00;False|2025-12-04T15:36:03.1568322+08:00;True|2025-12-03T19:58:39.4533793+08:00;True|2025-12-03T19:52:51.1409060+08:00;True|2025-12-03T19:51:42.1229811+08:00;True|2025-12-03T19:51:15.8450479+08:00;False|2025-12-03T19:50:51.2966327+08:00;False|2025-12-03T16:53:30.5213684+08:00;True|2025-12-02T12:44:40.6183861+08:00;False|2025-12-02T12:44:24.5789155+08:00;True|2025-12-02T09:26:46.2955107+08:00;True|2025-12-02T09:21:54.3264858+08:00;False|2025-12-02T09:21:34.1549180+08:00;True|2025-12-01T14:34:11.6114683+08:00;True|2025-12-01T14:28:44.9950983+08:00;True|2025-12-01T14:27:53.1434607+08:00;False|2025-12-01T14:27:32.3942829+08:00;False|2025-11-26T16:42:47.3562608+08:00;True|2025-11-25T15:06:09.2325014+08:00;False|2025-11-25T15:05:41.8496202+08:00;True|2025-11-07T14:53:42.4049572+08:00;False|2025-11-07T14:53:29.7282450+08:00;True|2025-11-06T19:55:50.3986389+08:00;False|2025-11-06T19:55:37.6951063+08:00;True|2025-11-06T18:55:19.6956604+08:00;False|2025-11-06T18:54:59.4904683+08:00;True|2025-11-05T08:43:47.0030261+08:00;False|2025-11-05T08:43:29.9947483+08:00;True|2025-11-04T17:28:17.0668341+08:00;True|2025-11-04T16:57:28.8159643+08:00;True|2025-11-04T16:50:31.4445039+08:00;False|2025-11-04T16:50:02.5463432+08:00;False|2025-10-24T11:55:45.1520972+08:00;True|2025-10-22T09:36:13.3802970+08:00;False|2025-10-22T09:35:40.2114838+08:00;True|2025-10-17T10:10:32.1090093+08:00;False|2025-10-17T10:10:14.2097087+08:00;True|2025-10-17T08:57:50.4986438+08:00;False|2025-10-17T08:57:34.6148729+08:00;True|2025-10-15T17:38:42.7890693+08:00;False|2025-10-15T17:38:29.5336459+08:00;True|2025-10-15T14:44:19.9596931+08:00;False|2025-10-15T14:44:06.9733338+08:00;True|2025-10-14T15:03:55.2080252+08:00;True|2025-10-14T13:50:06.8239140+08:00;False|2025-10-14T13:49:17.5380992+08:00;True|2025-10-09T15:43:21.8621182+08:00;False|2025-10-09T15:43:07.2600155+08:00;True|2025-10-07T23:04:35.2397704+08:00;False|2025-10-07T23:04:10.4706265+08:00;True|2025-09-28T09:24:29.0608591+08:00;True|2025-09-28T09:24:08.1555675+08:00;False|2025-09-28T09:23:37.9953809+08:00;True|2025-09-24T13:20:41.7630136+08:00;True|2025-09-24T13:08:47.9053398+08:00;False|2025-09-24T13:08:22.6986901+08:00;True|2025-09-21T15:31:27.7649877+08:00;False|2025-09-21T15:31:15.2147206+08:00;True|2025-09-20T11:54:14.1855999+08:00;True|2025-09-20T11:48:45.9925548+08:00;False|2025-09-20T11:48:33.9131018+08:00;True|2025-09-19T16:36:35.6353404+08:00;True|2025-09-19T16:33:44.0748704+08:00;True|2025-09-19T16:20:15.9184069+08:00;True|2025-09-19T16:18:32.6231345+08:00;True|2025-09-19T16:09:33.7546268+08:00;True|2025-09-19T16:07:13.0937562+08:00;True|2025-09-19T16:04:51.9894822+08:00;True|2025-09-19T16:02:41.2176918+08:00;True|2025-09-19T16:01:47.3472075+08:00;True|2025-09-19T15:59:59.9136845+08:00;True|2025-09-19T15:57:30.2055253+08:00;True|2025-09-19T15:44:09.8299759+08:00;True|2025-09-19T15:10:41.1911815+08:00;True|2025-09-19T15:10:17.6971176+08:00;True|2025-09-19T15:07:56.9882944+08:00;True|2025-09-19T15:05:06.6782885+08:00;True|2025-09-19T15:03:19.3977041+08:00;True|2025-09-19T14:55:51.8630332+08:00;True|2025-09-19T14:52:59.2129683+08:00;False|2025-09-19T14:52:32.3087506+08:00;True|2025-09-18T10:35:30.6927947+08:00;False|2025-09-18T10:35:09.3296840+08:00;False|2025-09-17T08:59:43.2361715+08:00;True|2025-09-16T13:46:04.3354749+08:00;True|2025-09-16T09:03:10.5224849+08:00;False|2025-09-16T09:02:54.0939495+08:00;True|2025-09-15T19:07:55.0065322+08:00;False|2025-09-15T19:07:43.9078258+08:00;True|2025-09-15T13:43:02.7194840+08:00;True|2025-09-15T12:43:41.8299278+08:00;False|2025-09-15T12:43:16.3202892+08:00;True|2025-09-14T20:52:09.3599497+08:00;False|2025-09-14T20:51:55.5551910+08:00;True|2025-09-14T16:35:56.4267213+08:00;True|2025-09-14T16:10:35.4507582+08:00;True|2025-09-14T16:04:30.0969247+08:00;True|2025-09-14T16:03:46.0958639+08:00;True|2025-09-14T16:01:52.5082969+08:00;True|2025-09-14T15:12:07.0239617+08:00;True|2025-09-14T14:55:31.3810881+08:00;False|2025-09-14T13:41:00.1248761+08:00;False|2025-09-12T09:12:36.1841750+08:00;True|2025-09-11T10:28:59.5711340+08:00;False|2025-09-11T10:28:29.0428624+08:00;True|2025-09-10T10:13:31.1270766+08:00;True|2025-09-10T09:36:50.3578377+08:00;False|2025-09-10T09:36:20.6920631+08:00;True|2025-09-08T09:40:08.0905332+08:00;False|2025-09-08T09:39:51.3125449+08:00;True|2025-09-05T15:38:09.2320346+08:00;True|2025-09-05T15:27:54.0459013+08:00;False|2025-09-05T15:27:44.7828443+08:00;True|2025-09-04T17:06:55.5968659+08:00;True|2025-09-04T17:05:18.9087838+08:00;True|2025-09-04T15:19:29.4095578+08:00;False|2025-09-04T15:19:02.5866931+08:00;True|2025-09-03T15:51:28.9030672+08:00;True|2025-09-03T15:50:23.6292004+08:00;True|2025-09-03T15:49:09.2787247+08:00;True|2025-09-03T15:37:43.1319700+08:00;True|2025-09-03T15:02:42.8547695+08:00;True|2025-09-03T13:59:23.7496636+08:00;False|2025-09-03T13:58:55.4054677+08:00;True|2025-09-02T14:17:50.6091123+08:00;True|2025-09-02T13:40:51.7669061+08:00;False|2025-09-02T13:40:13.3546740+08:00;False|2025-09-02T13:38:48.5403592+08:00;False|2025-09-02T13:37:59.6191295+08:00;False|2025-09-02T13:37:32.6098133+08:00;False|2025-09-02T13:37:12.0832669+08:00;True|2025-08-21T13:25:47.4858992+08:00;False|2025-08-21T13:25:32.4156686+08:00;True|2025-08-19T16:07:39.0889263+08:00;True|2025-08-19T16:07:20.3364203+08:00;False|2025-08-19T16:07:00.6078098+08:00;True|2025-08-15T13:33:04.6083649+08:00;False|2025-08-15T13:32:48.5596650+08:00;False|2025-08-14T11:07:04.9417057+08:00;True|2025-08-13T20:37:56.2729405+08:00;True|2025-08-13T20:27:46.2457492+08:00;False|2025-08-13T20:27:22.2365010+08:00;True|2025-08-13T17:38:47.4698629+08:00;True|2025-08-13T14:13:18.0867415+08:00;True|2025-08-13T14:10:53.5215303+08:00;False|2025-08-13T14:10:38.6533775+08:00;True|2025-08-08T14:45:38.8710223+08:00;True|2025-08-08T14:36:05.4506899+08:00;False|2025-08-08T14:35:49.2395019+08:00;True|2025-08-08T12:51:05.5753201+08:00;False|2025-08-08T12:50:41.8998290+08:00;True|2025-08-07T17:46:25.3848582+08:00;True|2025-08-07T14:41:24.7638189+08:00;False|2025-08-07T14:41:08.4966741+08:00;True|2025-08-07T13:18:45.4109538+08:00;False|2025-08-07T13:18:23.6541139+08:00;True|2025-08-06T14:48:29.1813368+08:00;False|2025-08-06T14:48:01.7497640+08:00;True|2025-07-31T11:31:26.9211602+08:00;True|2025-07-31T11:30:27.0395269+08:00;True|2025-07-31T11:20:53.3394769+08:00;True|2025-07-31T11:20:15.7759103+08:00;True|2025-07-31T11:16:57.3823431+08:00;True|2025-07-31T11:05:05.9382499+08:00;True|2025-07-31T10:53:29.9296027+08:00;True|2025-07-31T10:50:29.6294739+08:00;True|2025-07-31T09:38:12.2534472+08:00;True|2025-07-31T09:36:26.1364414+08:00;True|2025-07-31T09:09:38.4479829+08:00;True|2025-07-31T09:01:56.6376393+08:00;True|2025-07-31T08:57:38.0151708+08:00;False|2025-07-31T08:57:19.7029116+08:00;True|2025-07-30T13:59:10.3846558+08:00;True|2025-07-30T13:57:28.7712713+08:00;True|2025-07-30T13:30:14.3755448+08:00;True|2025-07-30T12:47:57.3189783+08:00;True|2025-07-30T12:44:40.9257897+08:00;True|2025-07-30T12:44:26.3988519+08:00;True|2025-07-30T12:42:14.3621410+08:00;True|2025-07-30T12:37:47.5857800+08:00;True|2025-07-30T11:29:53.6303914+08:00;True|2025-07-30T11:23:36.6544326+08:00;True|2025-07-30T09:52:50.5539574+08:00;True|2025-07-30T09:51:43.0235088+08:00;False|2025-07-30T09:51:20.4585269+08:00;True|2025-07-29T18:14:57.7912495+08:00;True|2025-07-29T18:06:59.7432032+08:00;True|2025-07-29T18:06:21.4067333+08:00;True|2025-07-29T18:04:44.7727076+08:00;True|2025-07-29T18:03:16.6330864+08:00;True|2025-07-29T17:58:22.4884094+08:00;True|2025-07-29T17:51:17.4731594+08:00;True|2025-07-29T17:30:02.5175752+08:00;True|2025-07-29T17:22:51.2206869+08:00;True|2025-07-29T15:58:06.7872139+08:00;True|2025-07-29T15:52:25.6935664+08:00;False|2025-07-29T15:51:57.5197553+08:00;True|2025-07-28T17:33:18.1495336+08:00;True|2025-07-28T15:04:36.1888394+08:00;True|2025-07-28T14:19:20.1483024+08:00;True|2025-07-28T14:13:33.0338382+08:00;True|2025-07-28T14:06:02.4983388+08:00;False|2025-07-28T14:05:44.8336761+08:00;False|2025-07-26T12:52:08.1302577+08:00;True|2025-07-25T18:16:22.4916372+08:00;True|2025-07-25T18:10:03.8748246+08:00;True|2025-07-25T18:09:20.6646310+08:00;True|2025-07-25T18:05:24.3772735+08:00;True|2025-07-25T17:56:03.7506046+08:00;True|2025-07-25T17:51:18.4125686+08:00;True|2025-07-25T14:26:44.2546206+08:00;False|2025-07-25T14:26:12.6493026+08:00;True|2025-07-16T19:29:27.0515947+08:00;True|2025-07-16T19:20:01.1132696+08:00;True|2025-07-16T19:16:14.3793010+08:00;True|2025-07-16T19:13:05.0534366+08:00;False|2025-07-16T19:12:48.7636107+08:00;True|2025-07-16T09:21:13.4303928+08:00;True|2025-07-16T09:17:35.4522435+08:00;False|2025-07-16T09:17:13.5076021+08:00;True|2025-07-15T16:57:08.8718036+08:00;False|2025-07-15T16:56:49.7095589+08:00;True|2025-07-10T17:26:30.2500808+08:00;True|2025-07-10T15:05:35.1960737+08:00;False|2025-07-10T15:05:24.5526075+08:00;True|2025-07-09T18:07:52.8307734+08:00;False|2025-07-09T18:07:32.9729733+08:00;True|2025-07-08T09:05:02.3758956+08:00;False|2025-07-08T09:04:45.0633912+08:00;True|2025-07-07T18:57:42.4794642+08:00;True|2025-07-07T18:45:14.4070657+08:00;False|2025-07-07T18:44:22.9506493+08:00;True|2025-07-01T11:37:30.2505294+08:00;True|2025-07-01T11:34:58.9780159+08:00;True|2025-07-01T11:30:55.9731169+08:00;True|2025-07-01T10:50:40.9750731+08:00;True|2025-07-01T10:49:29.5040084+08:00;True|2025-07-01T10:47:32.5577113+08:00;True|2025-07-01T10:45:01.5920641+08:00;False|2025-07-01T10:44:36.2906054+08:00;True|2025-06-30T20:20:37.5108405+08:00;True|2025-06-30T20:18:18.1141382+08:00;False|2025-06-30T20:17:50.2618215+08:00;True|2025-06-30T17:08:40.2046600+08:00;True|2025-06-30T14:13:27.9276170+08:00;False|2025-06-30T14:13:08.2955829+08:00;True|2025-06-26T14:59:37.9432510+08:00;False|2025-06-26T14:59:27.7120940+08:00;True|2025-06-25T10:08:11.5435336+08:00;True|2025-06-25T09:48:15.6545862+08:00;True|2025-06-25T09:17:39.4282829+08:00;False|2025-06-25T09:17:06.1173641+08:00;True|2025-06-24T14:24:24.8608110+08:00;True|2025-06-24T13:29:41.8846061+08:00;True|2025-06-24T11:40:24.7114753+08:00;True|2025-06-24T11:38:39.9925984+08:00;True|2025-06-24T11:31:43.1414921+08:00;True|2025-06-24T11:29:18.2941264+08:00;True|2025-06-24T11:14:30.3743100+08:00;True|2025-06-24T11:13:48.7680482+08:00;True|2025-06-24T11:09:58.5968569+08:00;True|2025-06-24T11:08:08.7682780+08:00;True|2025-06-24T10:37:50.2746842+08:00;True|2025-06-24T10:04:21.1792934+08:00;True|2025-06-24T09:38:18.3176776+08:00;True|2025-06-24T09:34:50.3708868+08:00;False|2025-06-24T09:34:26.4728698+08:00;True|2025-06-23T17:05:32.5796810+08:00;True|2025-06-23T17:04:05.0688937+08:00;True|2025-06-23T13:59:19.2688884+08:00;True|2025-06-23T11:29:10.3814551+08:00;True|2025-06-23T11:19:54.5044517+08:00;True|2025-06-23T11:05:38.5603293+08:00;True|2025-06-23T10:57:03.6611727+08:00;True|2025-06-23T10:49:36.9130331+08:00;False|2025-06-23T10:49:18.5916897+08:00;True|2025-06-20T13:29:58.8176897+08:00;True|2025-06-20T13:15:43.7374949+08:00;False|2025-06-20T13:15:20.7432688+08:00;True|2025-06-19T21:46:29.0476990+08:00;True|2025-06-19T21:44:07.0255680+08:00;True|2025-06-19T21:40:54.8917004+08:00;True|2025-06-19T21:30:44.8729100+08:00;True|2025-06-19T21:17:13.9288647+08:00;True|2025-06-19T21:11:59.7332020+08:00;True|2025-06-19T21:10:46.7558553+08:00;True|2025-06-19T21:06:59.9821855+08:00;True|2025-06-19T20:57:42.2255608+08:00;True|2025-06-19T20:54:22.1485351+08:00;True|2025-06-19T20:53:39.4877170+08:00;True|2025-06-19T20:51:40.1134467+08:00;True|2025-06-19T20:50:06.2220331+08:00;True|2025-06-19T20:43:40.4300258+08:00;True|2025-06-19T20:43:28.4637040+08:00;True|2025-06-19T20:40:58.3939790+08:00;True|2025-06-19T20:38:18.1067206+08:00;True|2025-06-19T20:34:36.8473391+08:00;True|2025-06-19T20:31:08.0652635+08:00;True|2025-06-19T20:29:17.2962865+08:00;True|2025-06-19T20:25:12.9054302+08:00;True|2025-06-19T20:19:04.3290755+08:00;True|2025-06-19T20:10:38.1069948+08:00;True|2025-06-19T20:07:41.9318197+08:00;True|2025-06-19T20:05:31.8825704+08:00;True|2025-06-19T19:59:45.4008154+08:00;True|2025-06-19T19:57:44.1169317+08:00;True|2025-06-19T19:49:05.9273689+08:00;True|2025-06-19T19:21:38.1003970+08:00;True|2025-06-19T19:21:29.4057702+08:00;True|2025-06-19T19:20:49.9520871+08:00;False|2025-06-19T19:20:33.1351490+08:00;True|2025-06-19T17:47:11.8899733+08:00;True|2025-06-19T17:45:51.9461440+08:00;True|2025-06-19T17:42:40.4214364+08:00;True|2025-06-19T17:32:29.9585738+08:00;True|2025-06-19T17:31:57.7429273+08:00;True|2025-06-19T17:31:22.8039838+08:00;True|2025-06-19T16:44:04.9869169+08:00;False|2025-06-19T16:43:53.4308248+08:00;True|2025-06-17T12:44:47.9445980+08:00;True|2025-06-17T12:43:01.6173041+08:00;True|2025-06-17T12:39:35.7469432+08:00;True|2025-06-17T12:17:21.9820010+08:00;True|2025-06-17T11:56:26.7990171+08:00;True|2025-06-17T11:51:59.9444746+08:00;True|2025-06-17T11:50:10.5654966+08:00;True|2025-06-17T11:47:05.2216982+08:00;True|2025-06-17T11:38:52.7237953+08:00;False|2025-06-17T11:38:34.7222132+08:00;True|2025-06-16T19:04:02.3364713+08:00;False|2025-06-16T19:03:45.5930596+08:00;True|2025-06-10T16:19:31.0614174+08:00;True|2025-06-10T16:15:20.6430188+08:00;True|2025-06-10T13:15:38.2392519+08:00;True|2025-06-10T13:14:06.0141666+08:00;True|2025-06-10T13:10:57.3109515+08:00;False|2025-06-10T13:10:44.6334322+08:00;True|2025-06-09T14:19:19.3678350+08:00;True|2025-06-09T13:59:16.4472313+08:00;True|2025-06-09T13:44:59.6573868+08:00;False|2025-06-09T13:44:35.1189385+08:00;True|2025-06-06T14:38:53.2242596+08:00;False|2025-06-06T14:38:29.8735366+08:00;True|2025-06-04T20:53:59.2893402+08:00;False|2025-06-04T20:53:43.4073803+08:00;True|2025-06-03T14:29:52.2448301+08:00;True|2025-06-03T13:56:38.1301683+08:00;True|2025-06-03T13:38:56.7749508+08:00;True|2025-06-03T13:28:45.2901426+08:00;True|2025-06-03T13:27:57.6382388+08:00;True|2025-06-03T13:25:05.8249778+08:00;True|2025-06-03T13:20:50.3714171+08:00;True|2025-06-03T13:19:44.4918539+08:00;True|2025-06-03T13:16:57.8393576+08:00;True|2025-06-03T13:15:35.6020739+08:00;True|2025-06-03T09:29:22.1826197+08:00;True|2025-06-03T08:54:43.5376489+08:00;True|2025-06-03T08:48:51.2196179+08:00;False|2025-06-03T08:48:23.6531326+08:00;True|2025-05-30T19:14:33.1321659+08:00;True|2025-05-30T19:09:28.6321844+08:00;False|2025-05-30T19:09:10.9611020+08:00;True|2025-05-30T11:10:09.3804694+08:00;False|2025-05-30T11:09:38.9759833+08:00;True|2025-05-30T09:25:55.8349264+08:00;False|2025-05-30T09:25:33.7512390+08:00;True|2025-05-29T13:19:09.3041429+08:00;False|2025-05-29T13:18:52.3875953+08:00;True|2025-05-28T18:34:06.8273247+08:00;True|2025-05-28T18:31:05.4364474+08:00;True|2025-05-28T18:27:41.8513807+08:00;True|2025-05-28T18:20:47.6240772+08:00;False|2025-05-28T18:20:38.0301633+08:00;True|2025-05-28T15:45:55.3418948+08:00;True|2025-05-28T15:44:59.7156409+08:00;True|2025-05-28T15:43:03.0458642+08:00;True|2025-05-28T15:40:55.1488977+08:00;True|2025-05-28T15:25:49.1288443+08:00;True|2025-05-28T14:35:05.2561044+08:00;True|2025-05-28T09:39:05.7154902+08:00;False|2025-05-28T09:38:43.0839585+08:00;True|2025-05-26T19:34:53.6400925+08:00;True|2025-05-26T19:19:09.7485729+08:00;True|2025-05-26T19:16:13.4436032+08:00;True|2025-05-26T19:15:41.5587345+08:00;True|2025-05-26T19:13:28.2496521+08:00;True|2025-05-26T19:11:13.9374078+08:00;True|2025-05-26T19:08:26.7288220+08:00;True|2025-05-26T19:07:41.6174469+08:00;True|2025-05-26T19:07:17.8455284+08:00;True|2025-05-26T19:03:18.8383293+08:00;True|2025-05-26T19:02:38.1409352+08:00;True|2025-05-26T18:04:23.0851072+08:00;True|2025-05-26T18:00:37.9490175+08:00;True|2025-05-26T17:36:14.9186618+08:00;True|2025-05-26T17:04:56.2652242+08:00;True|2025-05-26T17:03:32.3788117+08:00;True|2025-05-26T17:01:11.8316740+08:00;True|2025-05-26T16:54:02.0120204+08:00;True|2025-05-26T16:50:36.6739590+08:00;True|2025-05-26T16:20:54.0793563+08:00;True|2025-05-26T16:19:13.4466564+08:00;True|2025-05-26T16:18:37.0522011+08:00;True|2025-05-26T16:10:07.6439971+08:00;True|2025-05-26T16:07:37.9881606+08:00;True|2025-05-26T15:58:45.5790885+08:00;True|2025-05-26T15:57:39.8957333+08:00;True|2025-05-26T15:56:04.5332484+08:00;True|2025-05-26T15:54:08.6770273+08:00;True|2025-05-26T15:51:31.9863077+08:00;True|2025-05-26T14:17:37.4566639+08:00;True|2025-05-26T14:14:45.6478856+08:00;True|2025-05-26T14:13:32.3061443+08:00;True|2025-05-26T14:09:53.7668953+08:00;True|2025-05-26T14:08:53.7195888+08:00;True|2025-05-26T14:06:33.9160028+08:00;True|2025-05-26T09:43:55.0924210+08:00;True|2025-05-26T09:17:54.8815561+08:00;False|2025-05-26T09:17:46.0326457+08:00;True|2025-05-23T10:23:17.1057955+08:00;True|2025-05-23T10:22:31.7938776+08:00;False|2025-05-23T10:22:01.3464796+08:00;False|2025-05-23T10:21:56.8447978+08:00;True|2025-05-23T10:04:53.2423852+08:00;False|2025-05-23T10:04:21.9568682+08:00;True|2025-05-22T13:39:26.7824978+08:00;True|2025-05-22T12:19:49.9134386+08:00;False|2025-05-22T12:18:56.4955831+08:00;True|2025-05-22T09:31:52.8998426+08:00;False|2025-05-22T09:31:31.5103211+08:00;True|2025-05-21T21:36:19.8162653+08:00;True|2025-05-21T21:33:04.3951416+08:00;True|2025-05-21T21:31:06.3835951+08:00;True|2025-05-21T21:27:11.7590428+08:00;False|2025-05-21T21:26:18.2096217+08:00;True|2025-05-21T10:13:15.7576895+08:00;True|2025-05-21T10:08:35.9305095+08:00;False|2025-05-21T10:08:06.4393322+08:00;True|2025-05-20T20:52:06.7190772+08:00;False|2025-05-20T20:51:27.6441551+08:00;True|2025-05-20T10:50:39.3347667+08:00;True|2025-05-20T10:47:24.1628977+08:00;True|2025-05-20T10:42:22.4420459+08:00;True|2025-05-20T10:32:16.8802462+08:00;True|2025-05-20T10:20:12.5700338+08:00;False|2025-05-20T10:19:04.0954824+08:00;True|2025-05-19T10:08:49.0227698+08:00;True|2025-05-19T10:07:02.6110035+08:00;True|2025-05-19T10:05:49.7223902+08:00;True|2025-05-19T09:59:20.9398247+08:00;True|2025-05-19T09:58:31.8629178+08:00;False|2025-05-19T09:57:34.9251908+08:00;True|2025-05-17T12:01:30.1645467+08:00;True|2025-05-17T12:00:32.2339947+08:00;True|2025-05-17T11:55:19.4680460+08:00;True|2025-05-17T11:30:39.9716640+08:00;True|2025-05-17T11:24:41.2103791+08:00;False|2025-05-17T11:24:01.4177591+08:00;True|2025-05-16T16:04:53.4865079+08:00;True|2025-05-16T16:01:42.2978627+08:00;True|2025-05-16T15:59:07.5525777+08:00;True|2025-05-16T12:53:01.9848534+08:00;False|2025-05-16T12:52:37.5899807+08:00;True|2025-05-15T20:18:19.1959577+08:00;True|2025-05-15T20:16:31.3601343+08:00;False|2025-05-15T20:16:14.8877379+08:00;True|2025-05-15T17:13:41.3961273+08:00;True|2025-05-15T16:51:14.1735434+08:00;True|2025-05-15T16:40:38.1341678+08:00;True|2025-05-15T16:23:55.7504003+08:00;True|2025-05-15T15:39:08.0682854+08:00;True|2025-05-15T14:13:21.2837860+08:00;True|2025-05-15T13:36:02.4058882+08:00;True|2025-05-15T13:28:29.8243952+08:00;True|2025-05-15T10:26:14.6137519+08:00;True|2025-05-15T10:21:16.4378162+08:00;False|2025-05-15T10:20:39.3117941+08:00;False|2025-05-14T12:58:11.4083857+08:00;True|2025-04-22T09:20:49.3736316+08:00;True|2025-04-22T09:00:50.9347925+08:00;False|2025-04-22T09:00:33.2771403+08:00;True|2025-04-18T16:58:37.3251028+08:00;False|2025-04-18T16:58:06.8433100+08:00;False|2025-04-18T12:44:40.1660490+08:00;True|2025-04-17T09:55:34.1580504+08:00;True|2025-04-17T09:53:57.7138023+08:00;True|2025-04-17T08:09:58.6602026+08:00;False|2025-04-17T08:09:47.0841532+08:00;True|2025-04-16T10:32:52.7679790+08:00;False|2025-04-16T10:32:40.0727445+08:00;True|2025-04-15T15:29:30.4249752+08:00;True|2025-04-15T15:11:41.4886869+08:00;True|2025-04-15T14:32:57.3415642+08:00;True|2025-04-15T14:29:09.2544662+08:00;True|2025-04-15T14:26:45.3527085+08:00;True|2025-04-15T13:53:46.6655955+08:00;True|2025-04-15T13:36:17.8950794+08:00;True|2025-04-15T10:21:27.2817581+08:00;True|2025-04-15T09:31:18.5018558+08:00;True|2025-04-15T09:29:02.6800394+08:00;False|2025-04-15T09:28:48.9559077+08:00;False|2025-04-14T09:56:18.5240087+08:00;True|2025-04-10T10:06:37.9809030+08:00;True|2025-04-10T08:48:28.7916834+08:00;True|2025-04-10T08:45:40.8001951+08:00;False|2025-04-10T08:45:25.3629200+08:00;True|2025-04-08T10:48:51.1571828+08:00;False|2025-04-08T10:48:38.8386891+08:00;True|2025-04-03T15:58:43.2796893+08:00;True|2025-04-03T15:50:20.2609241+08:00;True|2025-04-03T15:48:25.2894489+08:00;True|2025-04-03T15:46:11.5793596+08:00;True|2025-04-03T15:42:09.2590464+08:00;True|2025-04-03T15:40:50.3642846+08:00;True|2025-04-03T15:18:26.3396856+08:00;True|2025-04-03T15:03:23.3873491+08:00;True|2025-04-03T15:02:37.7250782+08:00;True|2025-04-03T14:57:39.4695978+08:00;True|2025-04-03T14:56:15.9777984+08:00;True|2025-04-03T14:55:02.7047484+08:00;True|2025-04-03T14:52:02.2831331+08:00;True|2025-04-03T14:50:05.3999831+08:00;True|2025-04-03T14:48:15.4688500+08:00;True|2025-04-03T14:47:09.9901017+08:00;True|2025-04-03T14:23:52.3814877+08:00;True|2025-04-03T14:13:17.5825761+08:00;True|2025-04-03T14:11:40.3625146+08:00;False|2025-04-03T14:11:26.5182988+08:00;True|2025-04-01T11:00:10.5721058+08:00;True|2025-04-01T10:56:01.3606814+08:00;True|2025-04-01T10:43:08.9754745+08:00;True|2025-04-01T09:35:49.4493062+08:00;False|2025-04-01T09:35:34.0849515+08:00;True|2025-03-28T15:37:26.0089381+08:00;True|2025-03-28T15:36:04.5827659+08:00;False|2025-03-28T15:35:29.1086723+08:00;True|2025-03-28T13:27:52.4657652+08:00;True|2025-03-28T13:24:54.2318726+08:00;False|2025-03-28T13:24:38.1132697+08:00;False|2025-03-27T15:10:21.1631628+08:00;True|2025-03-26T12:54:27.5698188+08:00;True|2025-03-26T12:52:24.3193373+08:00;True|2025-03-26T12:47:35.8464773+08:00;True|2025-03-26T12:46:39.6287204+08:00;True|2025-03-26T12:41:49.0780387+08:00;True|2025-03-26T12:26:56.1978354+08:00;True|2025-03-26T11:55:08.1689812+08:00;True|2025-03-26T10:37:46.3192080+08:00;False|2025-03-26T10:37:33.1555802+08:00;True|2025-03-25T22:59:55.4631390+08:00;True|2025-03-25T22:58:05.0153954+08:00;False|2025-03-25T22:57:34.7338996+08:00;True|2025-03-25T15:34:14.0157397+08:00;True|2025-03-25T13:16:35.4266052+08:00;True|2025-03-25T13:15:00.5978093+08:00;True|2025-03-25T13:13:05.3147340+08:00;True|2025-03-25T13:11:09.2067782+08:00;True|2025-03-25T13:10:41.9562041+08:00;True|2025-03-25T13:08:59.6162951+08:00;True|2025-03-25T13:08:22.6754824+08:00;True|2025-03-25T12:56:01.8244720+08:00;True|2025-03-25T12:54:46.4657554+08:00;True|2025-03-25T12:52:43.1914868+08:00;True|2025-03-25T12:52:14.3383697+08:00;True|2025-03-25T12:51:23.9803137+08:00;True|2025-03-25T12:48:24.5136392+08:00;False|2025-03-25T12:48:08.8520734+08:00;True|2025-03-22T09:55:01.9290646+08:00;False|2025-03-22T09:54:41.3505928+08:00;True|2025-03-21T15:44:18.6728622+08:00;True|2025-03-21T14:40:13.1127776+08:00;True|2025-03-21T14:22:04.0317926+08:00;True|2025-03-21T14:09:14.7974252+08:00;True|2025-03-21T13:56:36.0273789+08:00;True|2025-03-21T13:39:24.0514954+08:00;True|2025-03-21T13:37:45.5076171+08:00;True|2025-03-21T13:32:16.6261602+08:00;True|2025-03-21T13:30:49.3544077+08:00;True|2025-03-21T12:34:21.5766510+08:00;True|2025-03-21T12:30:15.9179513+08:00;True|2025-03-21T12:19:14.4932635+08:00;True|2025-03-21T12:17:32.1009243+08:00;True|2025-03-21T12:16:10.7444099+08:00;True|2025-03-21T12:13:48.2460484+08:00;True|2025-03-21T12:11:44.7502759+08:00;True|2025-03-21T12:09:54.1637208+08:00;True|2025-03-21T11:48:05.8579065+08:00;True|2025-03-21T11:02:28.9589745+08:00;True|2025-03-21T10:45:58.0983118+08:00;True|2025-03-20T15:01:40.3595666+08:00;True|2025-03-20T14:55:19.0059522+08:00;True|2025-03-20T14:51:39.8660319+08:00;True|2025-03-20T14:27:56.5777746+08:00;True|2025-03-20T13:39:54.7519574+08:00;True|2025-03-19T09:05:48.0282472+08:00;True|2025-03-17T10:08:13.6442704+08:00;True|2025-03-17T09:38:45.1414063+08:00;False|2025-03-17T09:38:22.1405719+08:00;True|2025-03-14T09:32:40.9681768+08:00;True|2025-03-14T09:16:06.9157363+08:00;True|2025-03-14T09:13:01.1255797+08:00;True|2025-03-14T09:11:11.1674520+08:00;True|2025-03-14T09:08:06.9585979+08:00;False|2025-03-14T09:07:47.0760411+08:00;True|2025-03-13T15:55:41.7744956+08:00;True|2025-03-13T13:00:11.3007903+08:00;False|2025-03-13T12:59:36.8182552+08:00;True|2025-03-12T15:14:27.9947739+08:00;True|2025-03-12T15:03:55.1318390+08:00;True|2025-03-12T14:26:34.0190332+08:00;False|2025-03-12T14:25:59.1193483+08:00;True|2025-03-12T09:22:01.4883764+08:00;False|2025-03-12T09:21:39.0080903+08:00;True|2025-03-10T16:26:58.5018670+08:00;True|2025-03-10T16:24:00.3905172+08:00;True|2025-03-10T16:20:21.6595733+08:00;True|2025-03-10T16:18:07.2171657+08:00;True|2025-03-10T16:17:40.3642488+08:00;True|2025-03-10T15:56:00.8463304+08:00;False|2025-03-10T15:54:09.9161096+08:00;False|2025-03-07T10:17:09.2480344+08:00;True|2025-03-06T13:45:18.6674111+08:00;True|2025-03-06T13:43:45.5631731+08:00;False|2025-03-06T13:43:00.1471219+08:00;True|2025-03-06T10:48:04.2926112+08:00;True|2025-03-06T10:24:43.8490693+08:00;True|2025-03-06T09:51:10.8897698+08:00;True|2025-03-06T09:49:27.7421450+08:00;False|2025-03-06T09:49:03.3732372+08:00;True|2025-03-05T10:21:19.2996243+08:00;True|2025-03-05T10:16:03.8214445+08:00;True|2025-03-05T10:14:08.3530581+08:00;True|2025-03-05T10:12:43.5189214+08:00;True|2025-03-05T10:11:16.9120956+08:00;True|2025-03-05T10:05:48.7400931+08:00;False|2025-03-05T10:04:45.2322677+08:00;True|2025-03-04T13:33:54.2471288+08:00;True|2025-03-04T13:23:41.1767740+08:00;True|2025-03-04T11:28:16.4264524+08:00;True|2025-03-04T11:27:03.1611137+08:00;False|2025-03-04T11:26:20.1722430+08:00;True|2025-03-03T15:51:25.3111486+08:00;True|2025-03-03T15:49:32.9940710+08:00;True|2025-03-03T15:46:47.8394406+08:00;True|2025-03-03T15:44:08.2556647+08:00;True|2025-03-03T15:33:18.9879890+08:00;True|2025-03-03T15:31:24.7555763+08:00;True|2025-03-03T15:28:22.2926603+08:00;True|2025-03-03T15:27:18.8298542+08:00;True|2025-03-03T15:24:59.7379802+08:00;True|2025-03-03T15:23:34.0850359+08:00;True|2025-03-03T15:12:24.7076928+08:00;True|2025-03-03T15:04:52.9486877+08:00;True|2025-03-03T14:52:08.1750244+08:00;True|2025-03-03T14:50:55.1357809+08:00;True|2025-03-03T14:03:38.1176734+08:00;True|2023-10-12T09:41:32.8016639+08:00;True|2023-10-12T09:33:45.7062293+08:00;True|2023-10-12T09:25:29.1606626+08:00;True|2023-10-12T09:14:56.8301672+08:00;True|2023-10-12T08:49:06.9528588+08:00;True|2023-10-12T08:41:10.4198328+08:00;True|2023-10-12T08:18:17.0155897+08:00;True|2023-10-11T16:54:34.3349896+08:00;True|2023-10-11T09:31:56.5412983+08:00;True|2023-10-11T09:22:34.8025065+08:00;True|2023-10-10T09:16:33.9279356+08:00;True|2023-10-10T08:57:14.5748323+08:00;True|2023-10-09T09:53:51.8108832+08:00;True|2023-10-08T08:23:15.3020047+08:00;True|2023-10-07T09:41:46.6477464+08:00;True|2023-09-28T13:09:37.4726020+08:00;True|2023-09-28T10:25:25.5533941+08:00;True|2023-09-28T09:22:53.9752101+08:00;True|2023-09-27T09:09:26.8663364+08:00;True|2023-09-26T08:16:45.5815324+08:00;True|2023-09-25T16:06:51.3059542+08:00;False|2023-09-25T16:04:20.0823603+08:00;False|2023-09-25T16:02:50.2444755+08:00;False|2023-09-25T15:57:25.3025439+08:00;False|2023-09-25T15:56:49.6970018+08:00;False|2023-09-25T15:53:20.4815252+08:00;False|2023-09-25T15:50:19.8534089+08:00;True|2023-09-25T13:10:42.3669273+08:00;True|2021-09-27T16:24:34.0556986+08:00;True|2021-07-23T15:55:16.4166192+08:00;True|2021-07-23T15:55:10.5231272+08:00;True|2021-07-23T15:42:16.1730479+08:00;True|2021-07-23T13:59:03.2163357+08:00;True|2021-07-23T13:56:27.0248090+08:00;True|2021-07-23T13:50:06.6730828+08:00;True|2021-07-23T13:16:54.0609171+08:00;True|2021-07-23T09:47:26.2349449+08:00;True|2021-06-18T10:08:36.7720289+08:00;True|2021-06-18T10:02:02.8556313+08:00;True|2021-06-18T09:19:46.8101433+08:00;True|2021-06-17T11:28:10.2122132+08:00;True|2021-06-15T15:34:03.2312661+08:00;True|2021-06-15T15:15:22.7546719+08:00;True|2021-06-15T13:29:38.8451270+08:00;True|2021-06-15T13:24:00.8964134+08:00;True|2021-06-15T12:58:20.3927060+08:00;True|2021-06-15T12:23:25.0159432+08:00;True|2021-06-15T12:22:38.0563281+08:00;True|2021-06-15T11:28:19.6194535+08:00;True|2021-06-15T11:25:48.8728949+08:00;True|2021-06-15T11:09:38.1544762+08:00;True|2021-06-15T10:41:56.9826851+08:00;True|2021-06-15T10:35:25.0388391+08:00;True|2021-06-15T10:32:29.6233619+08:00;True|2021-06-15T09:23:13.5958671+08:00;True|2021-06-15T09:06:29.5417195+08:00;True|2021-06-15T08:37:15.2838896+08:00;True|2021-06-10T17:14:07.3138711+08:00;True|2021-06-10T17:01:12.2987318+08:00;True|2021-06-10T16:59:40.3348009+08:00;True|2021-06-10T16:46:10.5921685+08:00;True|2021-06-10T16:44:16.2724973+08:00;True|2021-06-10T14:39:02.6527482+08:00;True|2021-06-10T14:29:40.7812962+08:00;True|2021-06-10T14:25:39.2821282+08:00;True|2021-06-10T12:14:41.9132607+08:00;True|2021-06-09T18:13:34.0547788+08:00;True|2021-06-09T18:09:50.1762278+08:00;True|2021-06-09T18:00:21.8790266+08:00;True|2021-06-09T17:56:33.9442691+08:00;True|2021-06-09T14:04:32.7497044+08:00;True|2021-06-09T14:03:24.6380146+08:00;True|2021-06-09T14:01:43.0362725+08:00;True|2021-06-09T13:55:02.5402435+08:00;True|2021-06-09T13:52:40.0249905+08:00;True|2021-06-09T13:49:51.5385793+08:00;True|2021-06-09T13:49:17.1969762+08:00;True|2021-06-09T13:41:45.8438377+08:00;True|2021-06-09T13:36:33.2456459+08:00;True|2021-06-09T13:30:16.9451132+08:00;True|2021-06-09T13:17:58.5879548+08:00;True|2021-06-09T13:16:57.3408341+08:00;True|2021-06-09T13:15:05.8138183+08:00;True|2021-06-09T13:12:15.5302490+08:00;True|2021-06-09T13:10:47.8201239+08:00;True|2021-06-09T13:08:07.4256926+08:00;True|2021-06-09T13:00:02.7890031+08:00;True|2021-06-09T12:24:40.5779581+08:00;True|2021-06-09T11:37:09.7069564+08:00;True|2021-06-09T11:31:04.1006833+08:00;True|2021-06-09T09:55:08.3057126+08:00;True|2021-06-08T19:53:15.6886046+08:00;True|2021-06-08T19:20:42.7329855+08:00;True|2021-06-08T19:14:50.6279399+08:00;True|2021-06-08T19:13:38.2606918+08:00;True|2021-06-08T19:09:02.6131247+08:00;True|2021-06-08T15:26:29.1177990+08:00;True|2021-06-08T15:19:58.5398363+08:00;True|2021-06-08T15:17:22.9886891+08:00;True|2021-06-08T15:12:14.6339838+08:00;True|2021-06-08T14:51:00.8799652+08:00;True|2021-06-08T14:05:12.6659322+08:00;True|2021-06-08T13:43:40.9520061+08:00;True|2021-06-08T10:17:41.3958040+08:00;True|2021-06-08T10:15:02.9531430+08:00;True|2021-06-08T10:13:41.2052893+08:00;True|2021-06-08T10:03:42.7732330+08:00;True|2021-06-08T09:19:05.6925809+08:00;True|2021-06-08T09:16:51.2551694+08:00;True|2021-06-08T08:55:47.9089196+08:00;True|2021-06-08T08:54:17.8644326+08:00;True|2021-06-08T08:45:54.0145422+08:00;True|2021-06-08T08:44:04.2569950+08:00;True|2021-06-08T00:06:04.7376137+08:00;True|2021-06-08T00:04:38.0773596+08:00;True|2021-06-07T23:49:53.8045627+08:00;True|2021-06-07T23:22:13.3541265+08:00;True|2021-06-07T22:50:52.5159395+08:00;True|2021-06-07T22:45:07.1078061+08:00;True|2021-06-07T22:31:11.8021180+08:00;True|2021-06-07T22:28:59.6668746+08:00;True|2021-06-07T22:22:40.9337623+08:00;True|2021-06-07T17:47:23.5505559+08:00;True|2021-06-07T17:45:13.5831540+08:00;True|2021-06-05T07:11:01.7763083+08:00;True|2021-06-05T07:09:05.1958272+08:00;True|2021-06-05T07:07:49.7067173+08:00;True|2021-06-05T06:55:07.6636653+08:00;True|2021-06-05T06:53:43.3503529+08:00;True|2021-06-05T06:51:22.0905015+08:00;True|2021-06-05T06:49:55.7672067+08:00;True|2021-06-05T05:53:58.0861418+08:00;True|2021-06-05T05:50:07.2096908+08:00;True|2021-06-05T05:47:01.4240794+08:00;True|2021-06-05T05:44:46.6184627+08:00;True|2021-06-04T17:23:59.1828660+08:00;True|2021-06-04T17:12:55.1640467+08:00;True|2021-06-04T17:10:45.5488523+08:00;True|2021-06-04T17:00:56.3672787+08:00;True|2021-06-04T16:06:36.6880762+08:00;True|2021-06-04T16:03:40.4888248+08:00;True|2021-06-04T15:57:12.2559775+08:00;True|2021-06-04T15:53:18.4937427+08:00;True|2021-06-04T15:47:03.6428056+08:00;True|2021-06-04T14:00:15.5079491+08:00;True|2021-06-04T13:39:24.2724835+08:00;True|2021-06-04T10:36:24.7725284+08:00;True|2021-06-04T09:55:58.5820875+08:00;True|2021-06-04T09:54:31.8417288+08:00;True|2021-06-04T09:49:30.1299352+08:00;True|2021-06-02T01:13:35.0933908+08:00;True|2021-06-02T00:41:42.6942384+08:00;True|2021-06-02T00:34:16.2857357+08:00;True|2021-06-02T00:30:24.3715291+08:00;True|2021-06-02T00:28:05.7622093+08:00;True|2021-06-01T23:47:07.9812981+08:00;True|2021-06-01T23:43:54.6399997+08:00;True|2021-06-01T23:26:11.7387178+08:00;True|2021-06-01T23:24:01.7848138+08:00;True|2021-06-01T23:17:44.1499458+08:00;True|2021-06-01T22:53:53.2119388+08:00;True|2021-06-01T21:41:10.2077522+08:00;True|2021-06-01T18:20:43.2169444+08:00;True|2021-06-01T17:43:22.5732122+08:00;True|2021-06-01T17:42:17.2436639+08:00;True|2021-06-01T17:38:17.4943310+08:00;True|2021-06-01T17:36:57.0238586+08:00;True|2021-06-01T17:30:37.3487475+08:00;True|2021-06-01T17:27:02.9990906+08:00;True|2021-06-01T17:12:53.0479797+08:00;True|2021-06-01T17:12:09.3355906+08:00;True|2021-06-01T17:00:12.7270464+08:00;True|2021-06-01T16:59:01.8148500+08:00;True|2021-06-01T16:58:24.2363761+08:00;True|2021-06-01T16:55:09.7112426+08:00;True|2021-06-01T16:49:52.5036858+08:00;True|2021-06-01T16:46:54.0104279+08:00;True|2021-06-01T16:45:15.4974503+08:00;True|2021-06-01T16:43:27.9970309+08:00;True|2021-06-01T16:41:38.1709833+08:00;True|2021-06-01T16:35:26.5280595+08:00;True|2021-06-01T16:33:57.1397727+08:00;True|2021-06-01T16:32:06.3944162+08:00;True|2021-06-01T16:25:01.1116292+08:00;True|2021-06-01T16:18:36.2515412+08:00;True|2021-06-01T16:13:19.6237694+08:00;True|2021-06-01T16:10:58.1070245+08:00;True|2021-06-01T16:09:36.9385489+08:00;True|2021-06-01T16:08:12.6387651+08:00;True|2021-06-01T15:56:56.8265580+08:00;True|2021-06-01T15:55:24.4764864+08:00;True|2021-06-01T15:52:55.2991115+08:00;True|2021-06-01T15:42:11.4675544+08:00;True|2021-06-01T15:37:23.2605867+08:00;True|2021-06-01T15:36:07.1708859+08:00;True|2021-06-01T15:27:13.7607576+08:00;True|2021-06-01T15:26:02.1216167+08:00;True|2021-06-01T15:20:17.9785316+08:00;True|2021-06-01T15:17:31.7994535+08:00;True|2021-06-01T15:15:33.5870547+08:00;True|2021-06-01T14:48:48.5199499+08:00;True|2021-06-01T14:47:20.2642947+08:00;True|2021-06-01T14:35:18.9806312+08:00;True|2021-06-01T14:33:16.4926476+08:00;True|2021-06-01T14:09:52.1874112+08:00;True|2021-06-01T14:05:13.8582579+08:00;True|2021-06-01T14:00:48.2904877+08:00;True|2021-06-01T13:59:23.3066213+08:00;True|2021-06-01T13:56:48.0600266+08:00;True|2021-06-01T13:34:54.6842175+08:00;True|2021-06-01T13:25:18.0545294+08:00;True|2021-06-01T13:21:54.5203762+08:00;True|2021-06-01T13:16:21.1912230+08:00;True|2021-06-01T13:15:48.6019094+08:00;True|2021-06-01T13:15:01.6891992+08:00;True|2021-06-01T13:05:12.8050109+08:00;True|2021-06-01T12:56:50.4159001+08:00;True|2021-06-01T12:55:03.9062599+08:00;True|2021-06-01T12:50:27.5401681+08:00;True|2021-06-01T12:49:25.1885018+08:00;True|2021-06-01T12:47:37.2860892+08:00;True|2021-06-01T12:44:42.0069652+08:00;True|2021-06-01T12:41:06.6339839+08:00;True|2021-06-01T12:20:08.2825333+08:00;True|2021-06-01T12:17:54.3212651+08:00;True|2021-06-01T12:14:59.7872609+08:00;True|2021-06-01T12:13:59.8766709+08:00;True|2021-06-01T11:22:13.6818824+08:00;True|2021-06-01T11:11:11.8712602+08:00;True|2021-06-01T11:10:20.1735009+08:00;True|2021-06-01T11:08:17.1112299+08:00;True|2021-06-01T11:05:17.8698240+08:00;True|2021-06-01T10:44:43.4614150+08:00;True|2021-05-31T19:20:49.8593267+08:00;True|2021-05-31T19:19:26.2940461+08:00;True|2021-05-31T19:17:45.6039999+08:00;True|2021-05-31T19:08:59.0966761+08:00;True|2021-05-31T19:08:10.5596672+08:00;True|2021-05-31T19:06:39.0670555+08:00;True|2021-05-31T19:05:17.3676884+08:00;True|2021-05-31T19:02:32.1409470+08:00;True|2021-05-31T18:56:41.4179639+08:00;True|2021-05-31T18:42:20.2441083+08:00;True|2021-05-31T18:37:26.4114464+08:00;True|2021-05-31T18:23:19.4103344+08:00;True|2021-05-31T18:12:52.1436524+08:00;True|2021-05-31T18:09:51.8002595+08:00;True|2021-05-31T18:05:27.5639577+08:00;True|2021-05-31T18:03:35.9346540+08:00;True|2021-05-31T17:58:54.0393109+08:00;True|2021-05-31T17:55:12.5626152+08:00;True|2021-05-31T17:51:03.1966945+08:00;True|2021-05-31T17:49:19.8399729+08:00;True|2021-05-31T17:48:09.7657525+08:00;True|2021-05-31T17:46:21.2958557+08:00;True|2021-05-31T17:29:36.1284253+08:00;True|2021-05-31T17:25:21.8909234+08:00;True|2021-05-31T16:51:39.2706342+08:00;True|2021-05-31T16:49:33.0180809+08:00;True|2021-05-31T16:47:28.9366837+08:00;True|2021-05-31T16:45:54.1110876+08:00;True|2021-05-31T16:06:11.0032865+08:00;True|2021-05-31T16:03:11.8484779+08:00;True|2021-05-31T15:58:52.4728351+08:00;True|2021-05-31T15:52:41.3707489+08:00;True|2021-05-31T15:50:22.0767930+08:00;True|2021-05-31T14:55:08.8676668+08:00;True|2021-05-31T14:52:44.0538893+08:00;True|2021-05-31T13:58:49.2018041+08:00;True|2021-05-31T13:54:55.2565438+08:00;True|2021-05-31T13:51:07.8012368+08:00;True|2021-05-31T13:42:17.1041462+08:00;True|2021-05-31T13:41:18.8074005+08:00;True|2021-05-31T13:40:07.2910452+08:00;True|2021-05-31T13:33:41.8814879+08:00;True|2021-05-31T13:23:36.5532446+08:00;True|2021-05-31T13:21:56.2476049+08:00;True|2021-05-31T13:17:18.5030541+08:00;True|2021-05-31T13:15:40.9653645+08:00;True|2021-05-31T13:05:02.0114383+08:00;True|2021-05-31T13:03:31.1860836+08:00;True|2021-05-31T12:50:06.1218714+08:00;True|2021-05-31T10:37:20.3332108+08:00;True|2021-05-28T15:09:56.1970299+08:00;True|2021-05-28T14:25:51.6645627+08:00;True|2021-05-28T13:57:27.0842735+08:00;True|2021-05-28T09:43:20.1440634+08:00;True|2021-05-28T09:18:20.6994283+08:00;True|2021-05-27T17:48:05.1485157+08:00;True|2021-05-27T14:12:24.8809260+08:00;True|2021-05-27T13:55:41.4584398+08:00;True|2021-05-27T13:38:04.4939557+08:00;True|2021-05-25T17:58:59.4925936+08:00;True|2021-05-25T17:34:39.0766301+08:00;True|2021-05-25T16:52:27.5836825+08:00;True|2021-05-25T16:17:11.2915197+08:00;True|2021-05-25T15:56:40.9073807+08:00;True|2021-05-25T15:55:13.6625654+08:00;True|2021-05-25T14:19:47.6594488+08:00;True|2021-05-25T13:29:54.4902763+08:00;True|2021-05-25T10:07:46.4913499+08:00;True|2021-05-25T10:07:00.5180012+08:00;True|2021-05-25T10:03:19.5172048+08:00;True|2021-05-25T10:03:14.0017887+08:00;True|2021-05-25T09:56:45.2214181+08:00;True|2021-05-25T09:40:44.7928610+08:00;True|2021-05-25T09:39:54.9824104+08:00;True|2021-05-21T15:22:12.2171707+08:00;True|2021-05-21T15:19:42.7333615+08:00;True|2021-05-21T11:29:58.3974818+08:00;True|2021-05-21T11:28:09.4616811+08:00;True|2021-05-21T10:47:41.8471117+08:00;True|2021-05-21T10:22:07.2445648+08:00;True|2021-05-21T10:17:03.7723841+08:00;True|2021-05-20T19:16:06.9191828+08:00;True|2021-05-20T15:55:05.5871601+08:00;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
+    <History>True|2026-03-26T07:24:23.0836782Z;True|2026-03-26T11:10:08.3042976+08:00;True|2026-03-26T11:04:39.8490670+08:00;False|2026-03-26T11:04:01.8409022+08:00;False|2026-03-24T12:21:10.3834349+08:00;True|2026-03-23T15:35:54.6898024+08:00;False|2026-03-23T15:34:48.1478477+08:00;True|2026-03-18T10:30:24.0576652+08:00;False|2026-03-18T10:30:06.8189912+08:00;True|2026-03-11T21:10:16.4417106+08:00;False|2026-03-11T21:09:50.0199370+08:00;True|2026-03-06T13:02:30.1700626+08:00;False|2026-03-06T13:01:18.1921218+08:00;True|2026-03-04T10:20:16.4462648+08:00;False|2026-03-04T10:19:52.7213059+08:00;True|2026-03-03T09:01:55.3532585+08:00;False|2026-03-03T09:01:34.1180224+08:00;True|2026-03-02T17:54:01.0161175+08:00;True|2026-03-02T17:45:55.9591618+08:00;False|2026-03-02T17:44:40.3657472+08:00;True|2026-02-28T14:48:12.2214646+08:00;False|2026-02-28T14:47:57.2613147+08:00;True|2026-02-28T08:49:29.3709356+08:00;False|2026-02-28T08:49:10.2121819+08:00;True|2026-02-27T17:25:07.2604553+08:00;False|2026-02-27T17:24:38.7437638+08:00;False|2026-02-26T08:55:53.0918973+08:00;False|2026-02-25T15:53:33.2256623+08:00;True|2026-02-23T10:04:54.7226911+08:00;True|2026-02-23T09:57:05.9584101+08:00;False|2026-02-23T09:56:48.7304840+08:00;True|2026-02-02T15:19:54.4742719+08:00;True|2026-02-02T10:31:35.2889726+08:00;True|2026-02-02T10:30:22.0114186+08:00;True|2026-02-02T10:19:31.6468654+08:00;False|2026-02-02T10:19:07.6961464+08:00;True|2026-02-01T17:49:50.2373826+08:00;True|2026-02-01T17:43:45.8367335+08:00;True|2026-02-01T17:37:21.1681222+08:00;True|2026-02-01T17:30:44.8115393+08:00;True|2026-02-01T17:24:34.3543309+08:00;True|2026-02-01T15:55:00.9170790+08:00;False|2026-02-01T15:54:45.9715303+08:00;True|2026-01-30T16:00:15.7297670+08:00;True|2026-01-30T15:58:46.7261928+08:00;True|2026-01-30T15:55:26.3560928+08:00;True|2026-01-30T14:51:41.1899965+08:00;True|2026-01-30T10:44:51.1198066+08:00;False|2026-01-30T10:41:32.7181137+08:00;False|2026-01-29T12:26:43.1557204+08:00;True|2026-01-28T14:34:45.6195441+08:00;True|2026-01-28T12:04:43.8406153+08:00;True|2026-01-28T11:57:46.3318183+08:00;False|2026-01-28T11:57:33.6942821+08:00;False|2026-01-27T19:55:10.5020397+08:00;True|2026-01-22T16:26:15.4335521+08:00;False|2026-01-22T16:24:44.1639214+08:00;True|2026-01-21T12:44:50.7255065+08:00;True|2026-01-21T10:13:53.8661528+08:00;False|2026-01-21T10:13:30.3455869+08:00;True|2026-01-20T15:37:10.5876104+08:00;False|2026-01-20T15:36:09.6295896+08:00;True|2026-01-19T17:34:26.2575062+08:00;False|2026-01-19T17:34:01.4440031+08:00;True|2026-01-15T14:38:27.6246724+08:00;True|2026-01-15T14:32:18.8118329+08:00;False|2026-01-15T14:30:15.4333217+08:00;False|2026-01-15T14:30:03.1289160+08:00;False|2026-01-15T14:29:56.1941035+08:00;True|2026-01-09T14:06:08.1238984+08:00;False|2026-01-09T14:05:52.6015673+08:00;True|2026-01-07T17:42:56.5248615+08:00;False|2026-01-07T17:42:34.6924836+08:00;True|2026-01-05T16:12:27.5690710+08:00;True|2026-01-05T16:12:17.4425684+08:00;False|2026-01-05T16:12:03.0978959+08:00;True|2025-12-23T09:10:23.6893783+08:00;True|2025-12-23T09:07:26.6930977+08:00;False|2025-12-23T09:06:41.0915784+08:00;True|2025-12-23T08:40:29.7405628+08:00;False|2025-12-23T08:40:16.9341083+08:00;True|2025-12-22T17:42:46.9605488+08:00;True|2025-12-22T17:36:17.7159888+08:00;True|2025-12-22T17:24:39.2657970+08:00;False|2025-12-22T17:24:10.9683552+08:00;True|2025-12-22T17:11:32.7698140+08:00;True|2025-12-22T17:10:10.4453151+08:00;True|2025-12-22T17:09:26.6981581+08:00;True|2025-12-22T17:08:10.1973001+08:00;False|2025-12-22T17:08:00.4576327+08:00;True|2025-12-22T14:58:24.8825978+08:00;True|2025-12-22T14:54:31.0433963+08:00;True|2025-12-22T14:37:50.8363212+08:00;True|2025-12-22T14:29:14.1978041+08:00;True|2025-12-22T14:10:01.9969824+08:00;False|2025-12-22T14:09:36.1807155+08:00;True|2025-12-17T16:16:26.7825738+08:00;True|2025-12-17T16:15:16.0559691+08:00;True|2025-12-17T15:44:38.3317392+08:00;True|2025-12-17T10:19:06.7122186+08:00;False|2025-12-17T10:18:52.9280215+08:00;False|2025-12-12T09:23:50.5551285+08:00;True|2025-12-10T17:18:35.0298366+08:00;False|2025-12-10T17:18:13.1365696+08:00;True|2025-12-09T12:08:11.3908592+08:00;False|2025-12-09T12:07:58.5164793+08:00;True|2025-12-08T09:12:51.0932352+08:00;True|2025-12-08T09:10:41.2878088+08:00;True|2025-12-08T09:06:21.1445018+08:00;True|2025-12-08T09:04:37.3464741+08:00;True|2025-12-08T09:03:22.0422524+08:00;True|2025-12-08T08:58:24.8293057+08:00;True|2025-12-08T08:48:27.4588721+08:00;True|2025-12-08T08:43:56.2631642+08:00;True|2025-12-08T08:43:12.1755462+08:00;False|2025-12-08T08:42:46.8920155+08:00;True|2025-12-05T10:44:33.9514625+08:00;True|2025-12-05T10:32:48.6399523+08:00;False|2025-12-05T10:32:31.3728861+08:00;True|2025-12-04T16:24:38.4261651+08:00;True|2025-12-04T16:17:04.1081985+08:00;True|2025-12-04T16:13:49.5694236+08:00;True|2025-12-04T16:01:16.0391216+08:00;True|2025-12-04T16:00:53.6951993+08:00;True|2025-12-04T15:58:47.1517135+08:00;True|2025-12-04T15:42:30.5816099+08:00;True|2025-12-04T15:36:28.0075855+08:00;False|2025-12-04T15:36:03.1568322+08:00;True|2025-12-03T19:58:39.4533793+08:00;True|2025-12-03T19:52:51.1409060+08:00;True|2025-12-03T19:51:42.1229811+08:00;True|2025-12-03T19:51:15.8450479+08:00;False|2025-12-03T19:50:51.2966327+08:00;False|2025-12-03T16:53:30.5213684+08:00;True|2025-12-02T12:44:40.6183861+08:00;False|2025-12-02T12:44:24.5789155+08:00;True|2025-12-02T09:26:46.2955107+08:00;True|2025-12-02T09:21:54.3264858+08:00;False|2025-12-02T09:21:34.1549180+08:00;True|2025-12-01T14:34:11.6114683+08:00;True|2025-12-01T14:28:44.9950983+08:00;True|2025-12-01T14:27:53.1434607+08:00;False|2025-12-01T14:27:32.3942829+08:00;False|2025-11-26T16:42:47.3562608+08:00;True|2025-11-25T15:06:09.2325014+08:00;False|2025-11-25T15:05:41.8496202+08:00;True|2025-11-07T14:53:42.4049572+08:00;False|2025-11-07T14:53:29.7282450+08:00;True|2025-11-06T19:55:50.3986389+08:00;False|2025-11-06T19:55:37.6951063+08:00;True|2025-11-06T18:55:19.6956604+08:00;False|2025-11-06T18:54:59.4904683+08:00;True|2025-11-05T08:43:47.0030261+08:00;False|2025-11-05T08:43:29.9947483+08:00;True|2025-11-04T17:28:17.0668341+08:00;True|2025-11-04T16:57:28.8159643+08:00;True|2025-11-04T16:50:31.4445039+08:00;False|2025-11-04T16:50:02.5463432+08:00;False|2025-10-24T11:55:45.1520972+08:00;True|2025-10-22T09:36:13.3802970+08:00;False|2025-10-22T09:35:40.2114838+08:00;True|2025-10-17T10:10:32.1090093+08:00;False|2025-10-17T10:10:14.2097087+08:00;True|2025-10-17T08:57:50.4986438+08:00;False|2025-10-17T08:57:34.6148729+08:00;True|2025-10-15T17:38:42.7890693+08:00;False|2025-10-15T17:38:29.5336459+08:00;True|2025-10-15T14:44:19.9596931+08:00;False|2025-10-15T14:44:06.9733338+08:00;True|2025-10-14T15:03:55.2080252+08:00;True|2025-10-14T13:50:06.8239140+08:00;False|2025-10-14T13:49:17.5380992+08:00;True|2025-10-09T15:43:21.8621182+08:00;False|2025-10-09T15:43:07.2600155+08:00;True|2025-10-07T23:04:35.2397704+08:00;False|2025-10-07T23:04:10.4706265+08:00;True|2025-09-28T09:24:29.0608591+08:00;True|2025-09-28T09:24:08.1555675+08:00;False|2025-09-28T09:23:37.9953809+08:00;True|2025-09-24T13:20:41.7630136+08:00;True|2025-09-24T13:08:47.9053398+08:00;False|2025-09-24T13:08:22.6986901+08:00;True|2025-09-21T15:31:27.7649877+08:00;False|2025-09-21T15:31:15.2147206+08:00;True|2025-09-20T11:54:14.1855999+08:00;True|2025-09-20T11:48:45.9925548+08:00;False|2025-09-20T11:48:33.9131018+08:00;True|2025-09-19T16:36:35.6353404+08:00;True|2025-09-19T16:33:44.0748704+08:00;True|2025-09-19T16:20:15.9184069+08:00;True|2025-09-19T16:18:32.6231345+08:00;True|2025-09-19T16:09:33.7546268+08:00;True|2025-09-19T16:07:13.0937562+08:00;True|2025-09-19T16:04:51.9894822+08:00;True|2025-09-19T16:02:41.2176918+08:00;True|2025-09-19T16:01:47.3472075+08:00;True|2025-09-19T15:59:59.9136845+08:00;True|2025-09-19T15:57:30.2055253+08:00;True|2025-09-19T15:44:09.8299759+08:00;True|2025-09-19T15:10:41.1911815+08:00;True|2025-09-19T15:10:17.6971176+08:00;True|2025-09-19T15:07:56.9882944+08:00;True|2025-09-19T15:05:06.6782885+08:00;True|2025-09-19T15:03:19.3977041+08:00;True|2025-09-19T14:55:51.8630332+08:00;True|2025-09-19T14:52:59.2129683+08:00;False|2025-09-19T14:52:32.3087506+08:00;True|2025-09-18T10:35:30.6927947+08:00;False|2025-09-18T10:35:09.3296840+08:00;False|2025-09-17T08:59:43.2361715+08:00;True|2025-09-16T13:46:04.3354749+08:00;True|2025-09-16T09:03:10.5224849+08:00;False|2025-09-16T09:02:54.0939495+08:00;True|2025-09-15T19:07:55.0065322+08:00;False|2025-09-15T19:07:43.9078258+08:00;True|2025-09-15T13:43:02.7194840+08:00;True|2025-09-15T12:43:41.8299278+08:00;False|2025-09-15T12:43:16.3202892+08:00;True|2025-09-14T20:52:09.3599497+08:00;False|2025-09-14T20:51:55.5551910+08:00;True|2025-09-14T16:35:56.4267213+08:00;True|2025-09-14T16:10:35.4507582+08:00;True|2025-09-14T16:04:30.0969247+08:00;True|2025-09-14T16:03:46.0958639+08:00;True|2025-09-14T16:01:52.5082969+08:00;True|2025-09-14T15:12:07.0239617+08:00;True|2025-09-14T14:55:31.3810881+08:00;False|2025-09-14T13:41:00.1248761+08:00;False|2025-09-12T09:12:36.1841750+08:00;True|2025-09-11T10:28:59.5711340+08:00;False|2025-09-11T10:28:29.0428624+08:00;True|2025-09-10T10:13:31.1270766+08:00;True|2025-09-10T09:36:50.3578377+08:00;False|2025-09-10T09:36:20.6920631+08:00;True|2025-09-08T09:40:08.0905332+08:00;False|2025-09-08T09:39:51.3125449+08:00;True|2025-09-05T15:38:09.2320346+08:00;True|2025-09-05T15:27:54.0459013+08:00;False|2025-09-05T15:27:44.7828443+08:00;True|2025-09-04T17:06:55.5968659+08:00;True|2025-09-04T17:05:18.9087838+08:00;True|2025-09-04T15:19:29.4095578+08:00;False|2025-09-04T15:19:02.5866931+08:00;True|2025-09-03T15:51:28.9030672+08:00;True|2025-09-03T15:50:23.6292004+08:00;True|2025-09-03T15:49:09.2787247+08:00;True|2025-09-03T15:37:43.1319700+08:00;True|2025-09-03T15:02:42.8547695+08:00;True|2025-09-03T13:59:23.7496636+08:00;False|2025-09-03T13:58:55.4054677+08:00;True|2025-09-02T14:17:50.6091123+08:00;True|2025-09-02T13:40:51.7669061+08:00;False|2025-09-02T13:40:13.3546740+08:00;False|2025-09-02T13:38:48.5403592+08:00;False|2025-09-02T13:37:59.6191295+08:00;False|2025-09-02T13:37:32.6098133+08:00;False|2025-09-02T13:37:12.0832669+08:00;True|2025-08-21T13:25:47.4858992+08:00;False|2025-08-21T13:25:32.4156686+08:00;True|2025-08-19T16:07:39.0889263+08:00;True|2025-08-19T16:07:20.3364203+08:00;False|2025-08-19T16:07:00.6078098+08:00;True|2025-08-15T13:33:04.6083649+08:00;False|2025-08-15T13:32:48.5596650+08:00;False|2025-08-14T11:07:04.9417057+08:00;True|2025-08-13T20:37:56.2729405+08:00;True|2025-08-13T20:27:46.2457492+08:00;False|2025-08-13T20:27:22.2365010+08:00;True|2025-08-13T17:38:47.4698629+08:00;True|2025-08-13T14:13:18.0867415+08:00;True|2025-08-13T14:10:53.5215303+08:00;False|2025-08-13T14:10:38.6533775+08:00;True|2025-08-08T14:45:38.8710223+08:00;True|2025-08-08T14:36:05.4506899+08:00;False|2025-08-08T14:35:49.2395019+08:00;True|2025-08-08T12:51:05.5753201+08:00;False|2025-08-08T12:50:41.8998290+08:00;True|2025-08-07T17:46:25.3848582+08:00;True|2025-08-07T14:41:24.7638189+08:00;False|2025-08-07T14:41:08.4966741+08:00;True|2025-08-07T13:18:45.4109538+08:00;False|2025-08-07T13:18:23.6541139+08:00;True|2025-08-06T14:48:29.1813368+08:00;False|2025-08-06T14:48:01.7497640+08:00;True|2025-07-31T11:31:26.9211602+08:00;True|2025-07-31T11:30:27.0395269+08:00;True|2025-07-31T11:20:53.3394769+08:00;True|2025-07-31T11:20:15.7759103+08:00;True|2025-07-31T11:16:57.3823431+08:00;True|2025-07-31T11:05:05.9382499+08:00;True|2025-07-31T10:53:29.9296027+08:00;True|2025-07-31T10:50:29.6294739+08:00;True|2025-07-31T09:38:12.2534472+08:00;True|2025-07-31T09:36:26.1364414+08:00;True|2025-07-31T09:09:38.4479829+08:00;True|2025-07-31T09:01:56.6376393+08:00;True|2025-07-31T08:57:38.0151708+08:00;False|2025-07-31T08:57:19.7029116+08:00;True|2025-07-30T13:59:10.3846558+08:00;True|2025-07-30T13:57:28.7712713+08:00;True|2025-07-30T13:30:14.3755448+08:00;True|2025-07-30T12:47:57.3189783+08:00;True|2025-07-30T12:44:40.9257897+08:00;True|2025-07-30T12:44:26.3988519+08:00;True|2025-07-30T12:42:14.3621410+08:00;True|2025-07-30T12:37:47.5857800+08:00;True|2025-07-30T11:29:53.6303914+08:00;True|2025-07-30T11:23:36.6544326+08:00;True|2025-07-30T09:52:50.5539574+08:00;True|2025-07-30T09:51:43.0235088+08:00;False|2025-07-30T09:51:20.4585269+08:00;True|2025-07-29T18:14:57.7912495+08:00;True|2025-07-29T18:06:59.7432032+08:00;True|2025-07-29T18:06:21.4067333+08:00;True|2025-07-29T18:04:44.7727076+08:00;True|2025-07-29T18:03:16.6330864+08:00;True|2025-07-29T17:58:22.4884094+08:00;True|2025-07-29T17:51:17.4731594+08:00;True|2025-07-29T17:30:02.5175752+08:00;True|2025-07-29T17:22:51.2206869+08:00;True|2025-07-29T15:58:06.7872139+08:00;True|2025-07-29T15:52:25.6935664+08:00;False|2025-07-29T15:51:57.5197553+08:00;True|2025-07-28T17:33:18.1495336+08:00;True|2025-07-28T15:04:36.1888394+08:00;True|2025-07-28T14:19:20.1483024+08:00;True|2025-07-28T14:13:33.0338382+08:00;True|2025-07-28T14:06:02.4983388+08:00;False|2025-07-28T14:05:44.8336761+08:00;False|2025-07-26T12:52:08.1302577+08:00;True|2025-07-25T18:16:22.4916372+08:00;True|2025-07-25T18:10:03.8748246+08:00;True|2025-07-25T18:09:20.6646310+08:00;True|2025-07-25T18:05:24.3772735+08:00;True|2025-07-25T17:56:03.7506046+08:00;True|2025-07-25T17:51:18.4125686+08:00;True|2025-07-25T14:26:44.2546206+08:00;False|2025-07-25T14:26:12.6493026+08:00;True|2025-07-16T19:29:27.0515947+08:00;True|2025-07-16T19:20:01.1132696+08:00;True|2025-07-16T19:16:14.3793010+08:00;True|2025-07-16T19:13:05.0534366+08:00;False|2025-07-16T19:12:48.7636107+08:00;True|2025-07-16T09:21:13.4303928+08:00;True|2025-07-16T09:17:35.4522435+08:00;False|2025-07-16T09:17:13.5076021+08:00;True|2025-07-15T16:57:08.8718036+08:00;False|2025-07-15T16:56:49.7095589+08:00;True|2025-07-10T17:26:30.2500808+08:00;True|2025-07-10T15:05:35.1960737+08:00;False|2025-07-10T15:05:24.5526075+08:00;True|2025-07-09T18:07:52.8307734+08:00;False|2025-07-09T18:07:32.9729733+08:00;True|2025-07-08T09:05:02.3758956+08:00;False|2025-07-08T09:04:45.0633912+08:00;True|2025-07-07T18:57:42.4794642+08:00;True|2025-07-07T18:45:14.4070657+08:00;False|2025-07-07T18:44:22.9506493+08:00;True|2025-07-01T11:37:30.2505294+08:00;True|2025-07-01T11:34:58.9780159+08:00;True|2025-07-01T11:30:55.9731169+08:00;True|2025-07-01T10:50:40.9750731+08:00;True|2025-07-01T10:49:29.5040084+08:00;True|2025-07-01T10:47:32.5577113+08:00;True|2025-07-01T10:45:01.5920641+08:00;False|2025-07-01T10:44:36.2906054+08:00;True|2025-06-30T20:20:37.5108405+08:00;True|2025-06-30T20:18:18.1141382+08:00;False|2025-06-30T20:17:50.2618215+08:00;True|2025-06-30T17:08:40.2046600+08:00;True|2025-06-30T14:13:27.9276170+08:00;False|2025-06-30T14:13:08.2955829+08:00;True|2025-06-26T14:59:37.9432510+08:00;False|2025-06-26T14:59:27.7120940+08:00;True|2025-06-25T10:08:11.5435336+08:00;True|2025-06-25T09:48:15.6545862+08:00;True|2025-06-25T09:17:39.4282829+08:00;False|2025-06-25T09:17:06.1173641+08:00;True|2025-06-24T14:24:24.8608110+08:00;True|2025-06-24T13:29:41.8846061+08:00;True|2025-06-24T11:40:24.7114753+08:00;True|2025-06-24T11:38:39.9925984+08:00;True|2025-06-24T11:31:43.1414921+08:00;True|2025-06-24T11:29:18.2941264+08:00;True|2025-06-24T11:14:30.3743100+08:00;True|2025-06-24T11:13:48.7680482+08:00;True|2025-06-24T11:09:58.5968569+08:00;True|2025-06-24T11:08:08.7682780+08:00;True|2025-06-24T10:37:50.2746842+08:00;True|2025-06-24T10:04:21.1792934+08:00;True|2025-06-24T09:38:18.3176776+08:00;True|2025-06-24T09:34:50.3708868+08:00;False|2025-06-24T09:34:26.4728698+08:00;True|2025-06-23T17:05:32.5796810+08:00;True|2025-06-23T17:04:05.0688937+08:00;True|2025-06-23T13:59:19.2688884+08:00;True|2025-06-23T11:29:10.3814551+08:00;True|2025-06-23T11:19:54.5044517+08:00;True|2025-06-23T11:05:38.5603293+08:00;True|2025-06-23T10:57:03.6611727+08:00;True|2025-06-23T10:49:36.9130331+08:00;False|2025-06-23T10:49:18.5916897+08:00;True|2025-06-20T13:29:58.8176897+08:00;True|2025-06-20T13:15:43.7374949+08:00;False|2025-06-20T13:15:20.7432688+08:00;True|2025-06-19T21:46:29.0476990+08:00;True|2025-06-19T21:44:07.0255680+08:00;True|2025-06-19T21:40:54.8917004+08:00;True|2025-06-19T21:30:44.8729100+08:00;True|2025-06-19T21:17:13.9288647+08:00;True|2025-06-19T21:11:59.7332020+08:00;True|2025-06-19T21:10:46.7558553+08:00;True|2025-06-19T21:06:59.9821855+08:00;True|2025-06-19T20:57:42.2255608+08:00;True|2025-06-19T20:54:22.1485351+08:00;True|2025-06-19T20:53:39.4877170+08:00;True|2025-06-19T20:51:40.1134467+08:00;True|2025-06-19T20:50:06.2220331+08:00;True|2025-06-19T20:43:40.4300258+08:00;True|2025-06-19T20:43:28.4637040+08:00;True|2025-06-19T20:40:58.3939790+08:00;True|2025-06-19T20:38:18.1067206+08:00;True|2025-06-19T20:34:36.8473391+08:00;True|2025-06-19T20:31:08.0652635+08:00;True|2025-06-19T20:29:17.2962865+08:00;True|2025-06-19T20:25:12.9054302+08:00;True|2025-06-19T20:19:04.3290755+08:00;True|2025-06-19T20:10:38.1069948+08:00;True|2025-06-19T20:07:41.9318197+08:00;True|2025-06-19T20:05:31.8825704+08:00;True|2025-06-19T19:59:45.4008154+08:00;True|2025-06-19T19:57:44.1169317+08:00;True|2025-06-19T19:49:05.9273689+08:00;True|2025-06-19T19:21:38.1003970+08:00;True|2025-06-19T19:21:29.4057702+08:00;True|2025-06-19T19:20:49.9520871+08:00;False|2025-06-19T19:20:33.1351490+08:00;True|2025-06-19T17:47:11.8899733+08:00;True|2025-06-19T17:45:51.9461440+08:00;True|2025-06-19T17:42:40.4214364+08:00;True|2025-06-19T17:32:29.9585738+08:00;True|2025-06-19T17:31:57.7429273+08:00;True|2025-06-19T17:31:22.8039838+08:00;True|2025-06-19T16:44:04.9869169+08:00;False|2025-06-19T16:43:53.4308248+08:00;True|2025-06-17T12:44:47.9445980+08:00;True|2025-06-17T12:43:01.6173041+08:00;True|2025-06-17T12:39:35.7469432+08:00;True|2025-06-17T12:17:21.9820010+08:00;True|2025-06-17T11:56:26.7990171+08:00;True|2025-06-17T11:51:59.9444746+08:00;True|2025-06-17T11:50:10.5654966+08:00;True|2025-06-17T11:47:05.2216982+08:00;True|2025-06-17T11:38:52.7237953+08:00;False|2025-06-17T11:38:34.7222132+08:00;True|2025-06-16T19:04:02.3364713+08:00;False|2025-06-16T19:03:45.5930596+08:00;True|2025-06-10T16:19:31.0614174+08:00;True|2025-06-10T16:15:20.6430188+08:00;True|2025-06-10T13:15:38.2392519+08:00;True|2025-06-10T13:14:06.0141666+08:00;True|2025-06-10T13:10:57.3109515+08:00;False|2025-06-10T13:10:44.6334322+08:00;True|2025-06-09T14:19:19.3678350+08:00;True|2025-06-09T13:59:16.4472313+08:00;True|2025-06-09T13:44:59.6573868+08:00;False|2025-06-09T13:44:35.1189385+08:00;True|2025-06-06T14:38:53.2242596+08:00;False|2025-06-06T14:38:29.8735366+08:00;True|2025-06-04T20:53:59.2893402+08:00;False|2025-06-04T20:53:43.4073803+08:00;True|2025-06-03T14:29:52.2448301+08:00;True|2025-06-03T13:56:38.1301683+08:00;True|2025-06-03T13:38:56.7749508+08:00;True|2025-06-03T13:28:45.2901426+08:00;True|2025-06-03T13:27:57.6382388+08:00;True|2025-06-03T13:25:05.8249778+08:00;True|2025-06-03T13:20:50.3714171+08:00;True|2025-06-03T13:19:44.4918539+08:00;True|2025-06-03T13:16:57.8393576+08:00;True|2025-06-03T13:15:35.6020739+08:00;True|2025-06-03T09:29:22.1826197+08:00;True|2025-06-03T08:54:43.5376489+08:00;True|2025-06-03T08:48:51.2196179+08:00;False|2025-06-03T08:48:23.6531326+08:00;True|2025-05-30T19:14:33.1321659+08:00;True|2025-05-30T19:09:28.6321844+08:00;False|2025-05-30T19:09:10.9611020+08:00;True|2025-05-30T11:10:09.3804694+08:00;False|2025-05-30T11:09:38.9759833+08:00;True|2025-05-30T09:25:55.8349264+08:00;False|2025-05-30T09:25:33.7512390+08:00;True|2025-05-29T13:19:09.3041429+08:00;False|2025-05-29T13:18:52.3875953+08:00;True|2025-05-28T18:34:06.8273247+08:00;True|2025-05-28T18:31:05.4364474+08:00;True|2025-05-28T18:27:41.8513807+08:00;True|2025-05-28T18:20:47.6240772+08:00;False|2025-05-28T18:20:38.0301633+08:00;True|2025-05-28T15:45:55.3418948+08:00;True|2025-05-28T15:44:59.7156409+08:00;True|2025-05-28T15:43:03.0458642+08:00;True|2025-05-28T15:40:55.1488977+08:00;True|2025-05-28T15:25:49.1288443+08:00;True|2025-05-28T14:35:05.2561044+08:00;True|2025-05-28T09:39:05.7154902+08:00;False|2025-05-28T09:38:43.0839585+08:00;True|2025-05-26T19:34:53.6400925+08:00;True|2025-05-26T19:19:09.7485729+08:00;True|2025-05-26T19:16:13.4436032+08:00;True|2025-05-26T19:15:41.5587345+08:00;True|2025-05-26T19:13:28.2496521+08:00;True|2025-05-26T19:11:13.9374078+08:00;True|2025-05-26T19:08:26.7288220+08:00;True|2025-05-26T19:07:41.6174469+08:00;True|2025-05-26T19:07:17.8455284+08:00;True|2025-05-26T19:03:18.8383293+08:00;True|2025-05-26T19:02:38.1409352+08:00;True|2025-05-26T18:04:23.0851072+08:00;True|2025-05-26T18:00:37.9490175+08:00;True|2025-05-26T17:36:14.9186618+08:00;True|2025-05-26T17:04:56.2652242+08:00;True|2025-05-26T17:03:32.3788117+08:00;True|2025-05-26T17:01:11.8316740+08:00;True|2025-05-26T16:54:02.0120204+08:00;True|2025-05-26T16:50:36.6739590+08:00;True|2025-05-26T16:20:54.0793563+08:00;True|2025-05-26T16:19:13.4466564+08:00;True|2025-05-26T16:18:37.0522011+08:00;True|2025-05-26T16:10:07.6439971+08:00;True|2025-05-26T16:07:37.9881606+08:00;True|2025-05-26T15:58:45.5790885+08:00;True|2025-05-26T15:57:39.8957333+08:00;True|2025-05-26T15:56:04.5332484+08:00;True|2025-05-26T15:54:08.6770273+08:00;True|2025-05-26T15:51:31.9863077+08:00;True|2025-05-26T14:17:37.4566639+08:00;True|2025-05-26T14:14:45.6478856+08:00;True|2025-05-26T14:13:32.3061443+08:00;True|2025-05-26T14:09:53.7668953+08:00;True|2025-05-26T14:08:53.7195888+08:00;True|2025-05-26T14:06:33.9160028+08:00;True|2025-05-26T09:43:55.0924210+08:00;True|2025-05-26T09:17:54.8815561+08:00;False|2025-05-26T09:17:46.0326457+08:00;True|2025-05-23T10:23:17.1057955+08:00;True|2025-05-23T10:22:31.7938776+08:00;False|2025-05-23T10:22:01.3464796+08:00;False|2025-05-23T10:21:56.8447978+08:00;True|2025-05-23T10:04:53.2423852+08:00;False|2025-05-23T10:04:21.9568682+08:00;True|2025-05-22T13:39:26.7824978+08:00;True|2025-05-22T12:19:49.9134386+08:00;False|2025-05-22T12:18:56.4955831+08:00;True|2025-05-22T09:31:52.8998426+08:00;False|2025-05-22T09:31:31.5103211+08:00;True|2025-05-21T21:36:19.8162653+08:00;True|2025-05-21T21:33:04.3951416+08:00;True|2025-05-21T21:31:06.3835951+08:00;True|2025-05-21T21:27:11.7590428+08:00;False|2025-05-21T21:26:18.2096217+08:00;True|2025-05-21T10:13:15.7576895+08:00;True|2025-05-21T10:08:35.9305095+08:00;False|2025-05-21T10:08:06.4393322+08:00;True|2025-05-20T20:52:06.7190772+08:00;False|2025-05-20T20:51:27.6441551+08:00;True|2025-05-20T10:50:39.3347667+08:00;True|2025-05-20T10:47:24.1628977+08:00;True|2025-05-20T10:42:22.4420459+08:00;True|2025-05-20T10:32:16.8802462+08:00;True|2025-05-20T10:20:12.5700338+08:00;False|2025-05-20T10:19:04.0954824+08:00;True|2025-05-19T10:08:49.0227698+08:00;True|2025-05-19T10:07:02.6110035+08:00;True|2025-05-19T10:05:49.7223902+08:00;True|2025-05-19T09:59:20.9398247+08:00;True|2025-05-19T09:58:31.8629178+08:00;False|2025-05-19T09:57:34.9251908+08:00;True|2025-05-17T12:01:30.1645467+08:00;True|2025-05-17T12:00:32.2339947+08:00;True|2025-05-17T11:55:19.4680460+08:00;True|2025-05-17T11:30:39.9716640+08:00;True|2025-05-17T11:24:41.2103791+08:00;False|2025-05-17T11:24:01.4177591+08:00;True|2025-05-16T16:04:53.4865079+08:00;True|2025-05-16T16:01:42.2978627+08:00;True|2025-05-16T15:59:07.5525777+08:00;True|2025-05-16T12:53:01.9848534+08:00;False|2025-05-16T12:52:37.5899807+08:00;True|2025-05-15T20:18:19.1959577+08:00;True|2025-05-15T20:16:31.3601343+08:00;False|2025-05-15T20:16:14.8877379+08:00;True|2025-05-15T17:13:41.3961273+08:00;True|2025-05-15T16:51:14.1735434+08:00;True|2025-05-15T16:40:38.1341678+08:00;True|2025-05-15T16:23:55.7504003+08:00;True|2025-05-15T15:39:08.0682854+08:00;True|2025-05-15T14:13:21.2837860+08:00;True|2025-05-15T13:36:02.4058882+08:00;True|2025-05-15T13:28:29.8243952+08:00;True|2025-05-15T10:26:14.6137519+08:00;True|2025-05-15T10:21:16.4378162+08:00;False|2025-05-15T10:20:39.3117941+08:00;False|2025-05-14T12:58:11.4083857+08:00;True|2025-04-22T09:20:49.3736316+08:00;True|2025-04-22T09:00:50.9347925+08:00;False|2025-04-22T09:00:33.2771403+08:00;True|2025-04-18T16:58:37.3251028+08:00;False|2025-04-18T16:58:06.8433100+08:00;False|2025-04-18T12:44:40.1660490+08:00;True|2025-04-17T09:55:34.1580504+08:00;True|2025-04-17T09:53:57.7138023+08:00;True|2025-04-17T08:09:58.6602026+08:00;False|2025-04-17T08:09:47.0841532+08:00;True|2025-04-16T10:32:52.7679790+08:00;False|2025-04-16T10:32:40.0727445+08:00;True|2025-04-15T15:29:30.4249752+08:00;True|2025-04-15T15:11:41.4886869+08:00;True|2025-04-15T14:32:57.3415642+08:00;True|2025-04-15T14:29:09.2544662+08:00;True|2025-04-15T14:26:45.3527085+08:00;True|2025-04-15T13:53:46.6655955+08:00;True|2025-04-15T13:36:17.8950794+08:00;True|2025-04-15T10:21:27.2817581+08:00;True|2025-04-15T09:31:18.5018558+08:00;True|2025-04-15T09:29:02.6800394+08:00;False|2025-04-15T09:28:48.9559077+08:00;False|2025-04-14T09:56:18.5240087+08:00;True|2025-04-10T10:06:37.9809030+08:00;True|2025-04-10T08:48:28.7916834+08:00;True|2025-04-10T08:45:40.8001951+08:00;False|2025-04-10T08:45:25.3629200+08:00;True|2025-04-08T10:48:51.1571828+08:00;False|2025-04-08T10:48:38.8386891+08:00;True|2025-04-03T15:58:43.2796893+08:00;True|2025-04-03T15:50:20.2609241+08:00;True|2025-04-03T15:48:25.2894489+08:00;True|2025-04-03T15:46:11.5793596+08:00;True|2025-04-03T15:42:09.2590464+08:00;True|2025-04-03T15:40:50.3642846+08:00;True|2025-04-03T15:18:26.3396856+08:00;True|2025-04-03T15:03:23.3873491+08:00;True|2025-04-03T15:02:37.7250782+08:00;True|2025-04-03T14:57:39.4695978+08:00;True|2025-04-03T14:56:15.9777984+08:00;True|2025-04-03T14:55:02.7047484+08:00;True|2025-04-03T14:52:02.2831331+08:00;True|2025-04-03T14:50:05.3999831+08:00;True|2025-04-03T14:48:15.4688500+08:00;True|2025-04-03T14:47:09.9901017+08:00;True|2025-04-03T14:23:52.3814877+08:00;True|2025-04-03T14:13:17.5825761+08:00;True|2025-04-03T14:11:40.3625146+08:00;False|2025-04-03T14:11:26.5182988+08:00;True|2025-04-01T11:00:10.5721058+08:00;True|2025-04-01T10:56:01.3606814+08:00;True|2025-04-01T10:43:08.9754745+08:00;True|2025-04-01T09:35:49.4493062+08:00;False|2025-04-01T09:35:34.0849515+08:00;True|2025-03-28T15:37:26.0089381+08:00;True|2025-03-28T15:36:04.5827659+08:00;False|2025-03-28T15:35:29.1086723+08:00;True|2025-03-28T13:27:52.4657652+08:00;True|2025-03-28T13:24:54.2318726+08:00;False|2025-03-28T13:24:38.1132697+08:00;False|2025-03-27T15:10:21.1631628+08:00;True|2025-03-26T12:54:27.5698188+08:00;True|2025-03-26T12:52:24.3193373+08:00;True|2025-03-26T12:47:35.8464773+08:00;True|2025-03-26T12:46:39.6287204+08:00;True|2025-03-26T12:41:49.0780387+08:00;True|2025-03-26T12:26:56.1978354+08:00;True|2025-03-26T11:55:08.1689812+08:00;True|2025-03-26T10:37:46.3192080+08:00;False|2025-03-26T10:37:33.1555802+08:00;True|2025-03-25T22:59:55.4631390+08:00;True|2025-03-25T22:58:05.0153954+08:00;False|2025-03-25T22:57:34.7338996+08:00;True|2025-03-25T15:34:14.0157397+08:00;True|2025-03-25T13:16:35.4266052+08:00;True|2025-03-25T13:15:00.5978093+08:00;True|2025-03-25T13:13:05.3147340+08:00;True|2025-03-25T13:11:09.2067782+08:00;True|2025-03-25T13:10:41.9562041+08:00;True|2025-03-25T13:08:59.6162951+08:00;True|2025-03-25T13:08:22.6754824+08:00;True|2025-03-25T12:56:01.8244720+08:00;True|2025-03-25T12:54:46.4657554+08:00;True|2025-03-25T12:52:43.1914868+08:00;True|2025-03-25T12:52:14.3383697+08:00;True|2025-03-25T12:51:23.9803137+08:00;True|2025-03-25T12:48:24.5136392+08:00;False|2025-03-25T12:48:08.8520734+08:00;True|2025-03-22T09:55:01.9290646+08:00;False|2025-03-22T09:54:41.3505928+08:00;True|2025-03-21T15:44:18.6728622+08:00;True|2025-03-21T14:40:13.1127776+08:00;True|2025-03-21T14:22:04.0317926+08:00;True|2025-03-21T14:09:14.7974252+08:00;True|2025-03-21T13:56:36.0273789+08:00;True|2025-03-21T13:39:24.0514954+08:00;True|2025-03-21T13:37:45.5076171+08:00;True|2025-03-21T13:32:16.6261602+08:00;True|2025-03-21T13:30:49.3544077+08:00;True|2025-03-21T12:34:21.5766510+08:00;True|2025-03-21T12:30:15.9179513+08:00;True|2025-03-21T12:19:14.4932635+08:00;True|2025-03-21T12:17:32.1009243+08:00;True|2025-03-21T12:16:10.7444099+08:00;True|2025-03-21T12:13:48.2460484+08:00;True|2025-03-21T12:11:44.7502759+08:00;True|2025-03-21T12:09:54.1637208+08:00;True|2025-03-21T11:48:05.8579065+08:00;True|2025-03-21T11:02:28.9589745+08:00;True|2025-03-21T10:45:58.0983118+08:00;True|2025-03-20T15:01:40.3595666+08:00;True|2025-03-20T14:55:19.0059522+08:00;True|2025-03-20T14:51:39.8660319+08:00;True|2025-03-20T14:27:56.5777746+08:00;True|2025-03-20T13:39:54.7519574+08:00;True|2025-03-19T09:05:48.0282472+08:00;True|2025-03-17T10:08:13.6442704+08:00;True|2025-03-17T09:38:45.1414063+08:00;False|2025-03-17T09:38:22.1405719+08:00;True|2025-03-14T09:32:40.9681768+08:00;True|2025-03-14T09:16:06.9157363+08:00;True|2025-03-14T09:13:01.1255797+08:00;True|2025-03-14T09:11:11.1674520+08:00;True|2025-03-14T09:08:06.9585979+08:00;False|2025-03-14T09:07:47.0760411+08:00;True|2025-03-13T15:55:41.7744956+08:00;True|2025-03-13T13:00:11.3007903+08:00;False|2025-03-13T12:59:36.8182552+08:00;True|2025-03-12T15:14:27.9947739+08:00;True|2025-03-12T15:03:55.1318390+08:00;True|2025-03-12T14:26:34.0190332+08:00;False|2025-03-12T14:25:59.1193483+08:00;True|2025-03-12T09:22:01.4883764+08:00;False|2025-03-12T09:21:39.0080903+08:00;True|2025-03-10T16:26:58.5018670+08:00;True|2025-03-10T16:24:00.3905172+08:00;True|2025-03-10T16:20:21.6595733+08:00;True|2025-03-10T16:18:07.2171657+08:00;True|2025-03-10T16:17:40.3642488+08:00;True|2025-03-10T15:56:00.8463304+08:00;False|2025-03-10T15:54:09.9161096+08:00;False|2025-03-07T10:17:09.2480344+08:00;True|2025-03-06T13:45:18.6674111+08:00;True|2025-03-06T13:43:45.5631731+08:00;False|2025-03-06T13:43:00.1471219+08:00;True|2025-03-06T10:48:04.2926112+08:00;True|2025-03-06T10:24:43.8490693+08:00;True|2025-03-06T09:51:10.8897698+08:00;True|2025-03-06T09:49:27.7421450+08:00;False|2025-03-06T09:49:03.3732372+08:00;True|2025-03-05T10:21:19.2996243+08:00;True|2025-03-05T10:16:03.8214445+08:00;True|2025-03-05T10:14:08.3530581+08:00;True|2025-03-05T10:12:43.5189214+08:00;True|2025-03-05T10:11:16.9120956+08:00;True|2025-03-05T10:05:48.7400931+08:00;False|2025-03-05T10:04:45.2322677+08:00;True|2025-03-04T13:33:54.2471288+08:00;True|2025-03-04T13:23:41.1767740+08:00;True|2025-03-04T11:28:16.4264524+08:00;True|2025-03-04T11:27:03.1611137+08:00;False|2025-03-04T11:26:20.1722430+08:00;True|2025-03-03T15:51:25.3111486+08:00;True|2025-03-03T15:49:32.9940710+08:00;True|2025-03-03T15:46:47.8394406+08:00;True|2025-03-03T15:44:08.2556647+08:00;True|2025-03-03T15:33:18.9879890+08:00;True|2025-03-03T15:31:24.7555763+08:00;True|2025-03-03T15:28:22.2926603+08:00;True|2025-03-03T15:27:18.8298542+08:00;True|2025-03-03T15:24:59.7379802+08:00;True|2025-03-03T15:23:34.0850359+08:00;True|2025-03-03T15:12:24.7076928+08:00;True|2025-03-03T15:04:52.9486877+08:00;True|2025-03-03T14:52:08.1750244+08:00;True|2025-03-03T14:50:55.1357809+08:00;True|2025-03-03T14:03:38.1176734+08:00;True|2023-10-12T09:41:32.8016639+08:00;True|2023-10-12T09:33:45.7062293+08:00;True|2023-10-12T09:25:29.1606626+08:00;True|2023-10-12T09:14:56.8301672+08:00;True|2023-10-12T08:49:06.9528588+08:00;True|2023-10-12T08:41:10.4198328+08:00;True|2023-10-12T08:18:17.0155897+08:00;True|2023-10-11T16:54:34.3349896+08:00;True|2023-10-11T09:31:56.5412983+08:00;True|2023-10-11T09:22:34.8025065+08:00;True|2023-10-10T09:16:33.9279356+08:00;True|2023-10-10T08:57:14.5748323+08:00;True|2023-10-09T09:53:51.8108832+08:00;True|2023-10-08T08:23:15.3020047+08:00;True|2023-10-07T09:41:46.6477464+08:00;True|2023-09-28T13:09:37.4726020+08:00;True|2023-09-28T10:25:25.5533941+08:00;True|2023-09-28T09:22:53.9752101+08:00;True|2023-09-27T09:09:26.8663364+08:00;True|2023-09-26T08:16:45.5815324+08:00;True|2023-09-25T16:06:51.3059542+08:00;False|2023-09-25T16:04:20.0823603+08:00;False|2023-09-25T16:02:50.2444755+08:00;False|2023-09-25T15:57:25.3025439+08:00;False|2023-09-25T15:56:49.6970018+08:00;False|2023-09-25T15:53:20.4815252+08:00;False|2023-09-25T15:50:19.8534089+08:00;True|2023-09-25T13:10:42.3669273+08:00;True|2021-09-27T16:24:34.0556986+08:00;True|2021-07-23T15:55:16.4166192+08:00;True|2021-07-23T15:55:10.5231272+08:00;True|2021-07-23T15:42:16.1730479+08:00;True|2021-07-23T13:59:03.2163357+08:00;True|2021-07-23T13:56:27.0248090+08:00;True|2021-07-23T13:50:06.6730828+08:00;True|2021-07-23T13:16:54.0609171+08:00;True|2021-07-23T09:47:26.2349449+08:00;True|2021-06-18T10:08:36.7720289+08:00;True|2021-06-18T10:02:02.8556313+08:00;True|2021-06-18T09:19:46.8101433+08:00;True|2021-06-17T11:28:10.2122132+08:00;True|2021-06-15T15:34:03.2312661+08:00;True|2021-06-15T15:15:22.7546719+08:00;True|2021-06-15T13:29:38.8451270+08:00;True|2021-06-15T13:24:00.8964134+08:00;True|2021-06-15T12:58:20.3927060+08:00;True|2021-06-15T12:23:25.0159432+08:00;True|2021-06-15T12:22:38.0563281+08:00;True|2021-06-15T11:28:19.6194535+08:00;True|2021-06-15T11:25:48.8728949+08:00;True|2021-06-15T11:09:38.1544762+08:00;True|2021-06-15T10:41:56.9826851+08:00;True|2021-06-15T10:35:25.0388391+08:00;True|2021-06-15T10:32:29.6233619+08:00;True|2021-06-15T09:23:13.5958671+08:00;True|2021-06-15T09:06:29.5417195+08:00;True|2021-06-15T08:37:15.2838896+08:00;True|2021-06-10T17:14:07.3138711+08:00;True|2021-06-10T17:01:12.2987318+08:00;True|2021-06-10T16:59:40.3348009+08:00;True|2021-06-10T16:46:10.5921685+08:00;True|2021-06-10T16:44:16.2724973+08:00;True|2021-06-10T14:39:02.6527482+08:00;True|2021-06-10T14:29:40.7812962+08:00;True|2021-06-10T14:25:39.2821282+08:00;True|2021-06-10T12:14:41.9132607+08:00;True|2021-06-09T18:13:34.0547788+08:00;True|2021-06-09T18:09:50.1762278+08:00;True|2021-06-09T18:00:21.8790266+08:00;True|2021-06-09T17:56:33.9442691+08:00;True|2021-06-09T14:04:32.7497044+08:00;True|2021-06-09T14:03:24.6380146+08:00;True|2021-06-09T14:01:43.0362725+08:00;True|2021-06-09T13:55:02.5402435+08:00;True|2021-06-09T13:52:40.0249905+08:00;True|2021-06-09T13:49:51.5385793+08:00;True|2021-06-09T13:49:17.1969762+08:00;True|2021-06-09T13:41:45.8438377+08:00;True|2021-06-09T13:36:33.2456459+08:00;True|2021-06-09T13:30:16.9451132+08:00;True|2021-06-09T13:17:58.5879548+08:00;True|2021-06-09T13:16:57.3408341+08:00;True|2021-06-09T13:15:05.8138183+08:00;True|2021-06-09T13:12:15.5302490+08:00;True|2021-06-09T13:10:47.8201239+08:00;True|2021-06-09T13:08:07.4256926+08:00;True|2021-06-09T13:00:02.7890031+08:00;True|2021-06-09T12:24:40.5779581+08:00;True|2021-06-09T11:37:09.7069564+08:00;True|2021-06-09T11:31:04.1006833+08:00;True|2021-06-09T09:55:08.3057126+08:00;True|2021-06-08T19:53:15.6886046+08:00;True|2021-06-08T19:20:42.7329855+08:00;True|2021-06-08T19:14:50.6279399+08:00;True|2021-06-08T19:13:38.2606918+08:00;True|2021-06-08T19:09:02.6131247+08:00;True|2021-06-08T15:26:29.1177990+08:00;True|2021-06-08T15:19:58.5398363+08:00;True|2021-06-08T15:17:22.9886891+08:00;True|2021-06-08T15:12:14.6339838+08:00;True|2021-06-08T14:51:00.8799652+08:00;True|2021-06-08T14:05:12.6659322+08:00;True|2021-06-08T13:43:40.9520061+08:00;True|2021-06-08T10:17:41.3958040+08:00;True|2021-06-08T10:15:02.9531430+08:00;True|2021-06-08T10:13:41.2052893+08:00;True|2021-06-08T10:03:42.7732330+08:00;True|2021-06-08T09:19:05.6925809+08:00;True|2021-06-08T09:16:51.2551694+08:00;True|2021-06-08T08:55:47.9089196+08:00;True|2021-06-08T08:54:17.8644326+08:00;True|2021-06-08T08:45:54.0145422+08:00;True|2021-06-08T08:44:04.2569950+08:00;True|2021-06-08T00:06:04.7376137+08:00;True|2021-06-08T00:04:38.0773596+08:00;True|2021-06-07T23:49:53.8045627+08:00;True|2021-06-07T23:22:13.3541265+08:00;True|2021-06-07T22:50:52.5159395+08:00;True|2021-06-07T22:45:07.1078061+08:00;True|2021-06-07T22:31:11.8021180+08:00;True|2021-06-07T22:28:59.6668746+08:00;True|2021-06-07T22:22:40.9337623+08:00;True|2021-06-07T17:47:23.5505559+08:00;True|2021-06-07T17:45:13.5831540+08:00;True|2021-06-05T07:11:01.7763083+08:00;True|2021-06-05T07:09:05.1958272+08:00;True|2021-06-05T07:07:49.7067173+08:00;True|2021-06-05T06:55:07.6636653+08:00;True|2021-06-05T06:53:43.3503529+08:00;True|2021-06-05T06:51:22.0905015+08:00;True|2021-06-05T06:49:55.7672067+08:00;True|2021-06-05T05:53:58.0861418+08:00;True|2021-06-05T05:50:07.2096908+08:00;True|2021-06-05T05:47:01.4240794+08:00;True|2021-06-05T05:44:46.6184627+08:00;True|2021-06-04T17:23:59.1828660+08:00;True|2021-06-04T17:12:55.1640467+08:00;True|2021-06-04T17:10:45.5488523+08:00;True|2021-06-04T17:00:56.3672787+08:00;True|2021-06-04T16:06:36.6880762+08:00;True|2021-06-04T16:03:40.4888248+08:00;True|2021-06-04T15:57:12.2559775+08:00;True|2021-06-04T15:53:18.4937427+08:00;True|2021-06-04T15:47:03.6428056+08:00;True|2021-06-04T14:00:15.5079491+08:00;True|2021-06-04T13:39:24.2724835+08:00;True|2021-06-04T10:36:24.7725284+08:00;True|2021-06-04T09:55:58.5820875+08:00;True|2021-06-04T09:54:31.8417288+08:00;True|2021-06-04T09:49:30.1299352+08:00;True|2021-06-02T01:13:35.0933908+08:00;True|2021-06-02T00:41:42.6942384+08:00;True|2021-06-02T00:34:16.2857357+08:00;True|2021-06-02T00:30:24.3715291+08:00;True|2021-06-02T00:28:05.7622093+08:00;True|2021-06-01T23:47:07.9812981+08:00;True|2021-06-01T23:43:54.6399997+08:00;True|2021-06-01T23:26:11.7387178+08:00;True|2021-06-01T23:24:01.7848138+08:00;True|2021-06-01T23:17:44.1499458+08:00;True|2021-06-01T22:53:53.2119388+08:00;True|2021-06-01T21:41:10.2077522+08:00;True|2021-06-01T18:20:43.2169444+08:00;True|2021-06-01T17:43:22.5732122+08:00;True|2021-06-01T17:42:17.2436639+08:00;True|2021-06-01T17:38:17.4943310+08:00;True|2021-06-01T17:36:57.0238586+08:00;True|2021-06-01T17:30:37.3487475+08:00;True|2021-06-01T17:27:02.9990906+08:00;True|2021-06-01T17:12:53.0479797+08:00;True|2021-06-01T17:12:09.3355906+08:00;True|2021-06-01T17:00:12.7270464+08:00;True|2021-06-01T16:59:01.8148500+08:00;True|2021-06-01T16:58:24.2363761+08:00;True|2021-06-01T16:55:09.7112426+08:00;True|2021-06-01T16:49:52.5036858+08:00;True|2021-06-01T16:46:54.0104279+08:00;True|2021-06-01T16:45:15.4974503+08:00;True|2021-06-01T16:43:27.9970309+08:00;True|2021-06-01T16:41:38.1709833+08:00;True|2021-06-01T16:35:26.5280595+08:00;True|2021-06-01T16:33:57.1397727+08:00;True|2021-06-01T16:32:06.3944162+08:00;True|2021-06-01T16:25:01.1116292+08:00;True|2021-06-01T16:18:36.2515412+08:00;True|2021-06-01T16:13:19.6237694+08:00;True|2021-06-01T16:10:58.1070245+08:00;True|2021-06-01T16:09:36.9385489+08:00;True|2021-06-01T16:08:12.6387651+08:00;True|2021-06-01T15:56:56.8265580+08:00;True|2021-06-01T15:55:24.4764864+08:00;True|2021-06-01T15:52:55.2991115+08:00;True|2021-06-01T15:42:11.4675544+08:00;True|2021-06-01T15:37:23.2605867+08:00;True|2021-06-01T15:36:07.1708859+08:00;True|2021-06-01T15:27:13.7607576+08:00;True|2021-06-01T15:26:02.1216167+08:00;True|2021-06-01T15:20:17.9785316+08:00;True|2021-06-01T15:17:31.7994535+08:00;True|2021-06-01T15:15:33.5870547+08:00;True|2021-06-01T14:48:48.5199499+08:00;True|2021-06-01T14:47:20.2642947+08:00;True|2021-06-01T14:35:18.9806312+08:00;True|2021-06-01T14:33:16.4926476+08:00;True|2021-06-01T14:09:52.1874112+08:00;True|2021-06-01T14:05:13.8582579+08:00;True|2021-06-01T14:00:48.2904877+08:00;True|2021-06-01T13:59:23.3066213+08:00;True|2021-06-01T13:56:48.0600266+08:00;True|2021-06-01T13:34:54.6842175+08:00;True|2021-06-01T13:25:18.0545294+08:00;True|2021-06-01T13:21:54.5203762+08:00;True|2021-06-01T13:16:21.1912230+08:00;True|2021-06-01T13:15:48.6019094+08:00;True|2021-06-01T13:15:01.6891992+08:00;True|2021-06-01T13:05:12.8050109+08:00;True|2021-06-01T12:56:50.4159001+08:00;True|2021-06-01T12:55:03.9062599+08:00;True|2021-06-01T12:50:27.5401681+08:00;True|2021-06-01T12:49:25.1885018+08:00;True|2021-06-01T12:47:37.2860892+08:00;True|2021-06-01T12:44:42.0069652+08:00;True|2021-06-01T12:41:06.6339839+08:00;True|2021-06-01T12:20:08.2825333+08:00;True|2021-06-01T12:17:54.3212651+08:00;True|2021-06-01T12:14:59.7872609+08:00;True|2021-06-01T12:13:59.8766709+08:00;True|2021-06-01T11:22:13.6818824+08:00;True|2021-06-01T11:11:11.8712602+08:00;True|2021-06-01T11:10:20.1735009+08:00;True|2021-06-01T11:08:17.1112299+08:00;True|2021-06-01T11:05:17.8698240+08:00;True|2021-06-01T10:44:43.4614150+08:00;True|2021-05-31T19:20:49.8593267+08:00;True|2021-05-31T19:19:26.2940461+08:00;True|2021-05-31T19:17:45.6039999+08:00;True|2021-05-31T19:08:59.0966761+08:00;True|2021-05-31T19:08:10.5596672+08:00;True|2021-05-31T19:06:39.0670555+08:00;True|2021-05-31T19:05:17.3676884+08:00;True|2021-05-31T19:02:32.1409470+08:00;True|2021-05-31T18:56:41.4179639+08:00;True|2021-05-31T18:42:20.2441083+08:00;True|2021-05-31T18:37:26.4114464+08:00;True|2021-05-31T18:23:19.4103344+08:00;True|2021-05-31T18:12:52.1436524+08:00;True|2021-05-31T18:09:51.8002595+08:00;True|2021-05-31T18:05:27.5639577+08:00;True|2021-05-31T18:03:35.9346540+08:00;True|2021-05-31T17:58:54.0393109+08:00;True|2021-05-31T17:55:12.5626152+08:00;True|2021-05-31T17:51:03.1966945+08:00;True|2021-05-31T17:49:19.8399729+08:00;True|2021-05-31T17:48:09.7657525+08:00;True|2021-05-31T17:46:21.2958557+08:00;True|2021-05-31T17:29:36.1284253+08:00;True|2021-05-31T17:25:21.8909234+08:00;True|2021-05-31T16:51:39.2706342+08:00;True|2021-05-31T16:49:33.0180809+08:00;True|2021-05-31T16:47:28.9366837+08:00;True|2021-05-31T16:45:54.1110876+08:00;True|2021-05-31T16:06:11.0032865+08:00;True|2021-05-31T16:03:11.8484779+08:00;True|2021-05-31T15:58:52.4728351+08:00;True|2021-05-31T15:52:41.3707489+08:00;True|2021-05-31T15:50:22.0767930+08:00;True|2021-05-31T14:55:08.8676668+08:00;True|2021-05-31T14:52:44.0538893+08:00;True|2021-05-31T13:58:49.2018041+08:00;True|2021-05-31T13:54:55.2565438+08:00;True|2021-05-31T13:51:07.8012368+08:00;True|2021-05-31T13:42:17.1041462+08:00;True|2021-05-31T13:41:18.8074005+08:00;True|2021-05-31T13:40:07.2910452+08:00;True|2021-05-31T13:33:41.8814879+08:00;True|2021-05-31T13:23:36.5532446+08:00;True|2021-05-31T13:21:56.2476049+08:00;True|2021-05-31T13:17:18.5030541+08:00;True|2021-05-31T13:15:40.9653645+08:00;True|2021-05-31T13:05:02.0114383+08:00;True|2021-05-31T13:03:31.1860836+08:00;True|2021-05-31T12:50:06.1218714+08:00;True|2021-05-31T10:37:20.3332108+08:00;True|2021-05-28T15:09:56.1970299+08:00;True|2021-05-28T14:25:51.6645627+08:00;True|2021-05-28T13:57:27.0842735+08:00;True|2021-05-28T09:43:20.1440634+08:00;True|2021-05-28T09:18:20.6994283+08:00;True|2021-05-27T17:48:05.1485157+08:00;True|2021-05-27T14:12:24.8809260+08:00;True|2021-05-27T13:55:41.4584398+08:00;True|2021-05-27T13:38:04.4939557+08:00;True|2021-05-25T17:58:59.4925936+08:00;True|2021-05-25T17:34:39.0766301+08:00;True|2021-05-25T16:52:27.5836825+08:00;True|2021-05-25T16:17:11.2915197+08:00;True|2021-05-25T15:56:40.9073807+08:00;True|2021-05-25T15:55:13.6625654+08:00;True|2021-05-25T14:19:47.6594488+08:00;True|2021-05-25T13:29:54.4902763+08:00;True|2021-05-25T10:07:46.4913499+08:00;True|2021-05-25T10:07:00.5180012+08:00;True|2021-05-25T10:03:19.5172048+08:00;True|2021-05-25T10:03:14.0017887+08:00;True|2021-05-25T09:56:45.2214181+08:00;True|2021-05-25T09:40:44.7928610+08:00;True|2021-05-25T09:39:54.9824104+08:00;True|2021-05-21T15:22:12.2171707+08:00;True|2021-05-21T15:19:42.7333615+08:00;True|2021-05-21T11:29:58.3974818+08:00;True|2021-05-21T11:28:09.4616811+08:00;True|2021-05-21T10:47:41.8471117+08:00;True|2021-05-21T10:22:07.2445648+08:00;True|2021-05-21T10:17:03.7723841+08:00;True|2021-05-20T19:16:06.9191828+08:00;True|2021-05-20T15:55:05.5871601+08:00;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="bin/layuiadmin/layui/layui.js">
@@ -29,11 +29,11 @@
     </File>
     <File Include="bin/WebTM.dll">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>03/06/2026 13:01:09</publishTime>
+      <publishTime>03/26/2026 11:04:20</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>03/06/2026 13:01:09</publishTime>
+      <publishTime>03/26/2026 11:04:20</publishTime>
     </File>
     <File Include="Download/WMS杞欢瀹夎鍖�.apk">
       <publishTime>07/26/2025 12:50:47</publishTime>
@@ -1244,7 +1244,7 @@
     <File Include="layuiadmin/Scripts/webConfig.js">
       <publishTime>04/27/2021 13:44:39</publishTime>
       <publishTime>04/30/2021 08:50:34</publishTime>
-      <publishTime>03/06/2026 13:01:08</publishTime>
+      <publishTime>03/24/2026 10:52:24</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig2.js">
       <publishTime>09/26/2025 09:45:44</publishTime>
@@ -2433,7 +2433,7 @@
       <publishTime>03/06/2026 12:59:44</publishTime>
     </File>
     <File Include="views/IpadIndex.html">
-      <publishTime>02/28/2026 13:34:01</publishTime>
+      <publishTime>03/17/2026 18:29:20</publishTime>
     </File>
     <File Include="views/IpadStepIndex.html">
       <publishTime>05/23/2025 09:19:17</publishTime>
@@ -3356,7 +3356,10 @@
       <publishTime>06/26/2025 17:53:49</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/鏉$爜鐢熸垚/Gy_BarCodeBill.html">
-      <publishTime>10/24/2025 11:53:31</publishTime>
+      <publishTime>03/24/2026 10:47:47</publishTime>
+    </File>
+    <File Include="views/浠撳瓨绠$悊/鏉$爜鐢熸垚/Gy_BarCodeBill_HuaZhou.html">
+      <publishTime>03/24/2026 15:46:13</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/鏉$爜鐢熸垚/Gy_BarCodeBill_JiaNan.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -3368,7 +3371,7 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
-      <publishTime>02/25/2026 15:50:00</publishTime>
+      <publishTime>03/26/2026 15:19:44</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/缁勬墭鍗�/Sc_PackUnionBillMain_Setto.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -3577,7 +3580,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkStationList.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -3706,7 +3709,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkType.html">
-      <publishTime>02/25/2026 15:50:00</publishTime>
+      <publishTime>03/18/2026 10:24:29</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkTypeList_PDA.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -3821,7 +3824,7 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>10/24/2025 11:53:31</publishTime>
+      <publishTime>03/20/2026 09:13:33</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialCorrection.html">
       <publishTime>05/30/2025 11:06:37</publishTime>
@@ -3954,7 +3957,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html">
-      <publishTime>06/13/2025 14:06:40</publishTime>
+      <publishTime>03/15/2026 15:36:31</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterType.html">
       <publishTime>06/13/2025 14:06:40</publishTime>
@@ -4023,13 +4026,13 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkType.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
-      <publishTime>02/01/2026 17:33:06</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint_GXPG.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4084,6 +4087,9 @@
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Gy_WarehouseList.aspx">
       <publishTime>05/23/2025 09:19:18</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Gy_WorkStationList.aspx">
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_HGy_BarCodeBill.aspx">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4896,7 +4902,10 @@
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>01/20/2026 15:38:06</publishTime>
+      <publishTime>03/24/2026 15:05:52</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier2_JD.html">
+      <publishTime>03/24/2026 15:30:15</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -5221,7 +5230,7 @@
       <publishTime>02/26/2026 08:50:05</publishTime>
     </File>
     <File Include="views/鎴愭湰绠$悊/鏈熷垵鍦ㄤ骇鍝佽〃/Gy_WIPBal_Excel.html">
-      <publishTime>03/06/2026 12:59:44</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/鎴愭湰绠$悊/鏈熷垵鍦ㄤ骇鍝佽〃/Kf_WIPBal.html">
       <publishTime>03/06/2026 12:59:44</publishTime>
@@ -5233,7 +5242,7 @@
       <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/鎴愭湰绠$悊/璐圭敤鍗曞紩鍏�/CB_ItemMoneyBillImport.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/鎴愭湰绠$悊/璐圭敤鍗曞紩鍏�/CB_ItemMoneyBill_Excel.html">
       <publishTime>03/06/2026 12:59:44</publishTime>
@@ -5269,7 +5278,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/涓婃ā鍗�/Sc_MouldLowerBillList.html">
-      <publishTime>07/08/2025 17:21:14</publishTime>
+      <publishTime>03/18/2026 10:14:23</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/涓婃ā鍗�/Sc_MouldLowerBillList_PDA.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5281,7 +5290,7 @@
       <publishTime>07/02/2025 11:41:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/涓婃ā鍗�/Sc_MouldUpperBillList.html">
-      <publishTime>07/08/2025 17:20:30</publishTime>
+      <publishTime>03/18/2026 10:13:48</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/涓婃ā鍗�/Sc_MouldUpperBillList_PDA.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5308,7 +5317,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldConkBookBillMainReport.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>03/26/2026 11:09:56</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldDotCheckTaskReport.html">
       <publishTime>03/06/2026 12:59:44</publishTime>
@@ -5320,7 +5329,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldMaintainBillMainReport.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>03/26/2026 11:09:52</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldMaintainTaskReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5332,16 +5341,16 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldRepairWorkBillReport.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>03/26/2026 11:09:58</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldResumeCheckQuery.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillEdit.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList.html">
-      <publishTime>06/13/2025 14:06:40</publishTime>
+      <publishTime>03/18/2026 10:23:54</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList_PDA.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5353,7 +5362,7 @@
       <publishTime>06/13/2025 14:06:40</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿缁翠慨娲惧伐鍗�/Sc_MouldRepairSendWorkBillList.html">
-      <publishTime>06/09/2025 12:01:41</publishTime>
+      <publishTime>03/18/2026 10:15:28</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿璋冩嫧鐢宠鍗�/Sc_MouldMoveStockRequestBillEdit.html">
       <publishTime>12/02/2025 10:22:29</publishTime>
@@ -5392,7 +5401,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鎶曚骇楠屾敹鍗�/Sc_MouldBatchWorkCheckBillEdit.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鎶曚骇楠屾敹鍗�/Sc_MouldBatchWorkCheckBillList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5545,13 +5554,13 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillEdit.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>03/24/2026 10:51:02</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
       <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">
       <publishTime>05/28/2025 09:37:26</publishTime>
@@ -5566,7 +5575,7 @@
       <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit_old.html">
       <publishTime>12/02/2025 10:22:29</publishTime>
@@ -5602,7 +5611,7 @@
       <publishTime>08/27/2021 09:06:17</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBill.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
       <publishTime>06/13/2025 14:06:40</publishTime>
@@ -5677,10 +5686,10 @@
       <publishTime>07/19/2021 10:10:46</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
-      <publishTime>03/06/2026 12:59:44</publishTime>
+      <publishTime>03/25/2026 13:17:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
-      <publishTime>03/03/2026 12:48:15</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5717,13 +5726,13 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>06/09/2025 12:01:42</publishTime>
+      <publishTime>03/18/2026 10:16:02</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
       <publishTime>06/13/2025 14:06:40</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>06/09/2025 12:01:42</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
       <publishTime>01/07/2026 17:42:28</publishTime>
@@ -5775,12 +5784,12 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>06/13/2025 14:06:40</publishTime>
+      <publishTime>03/18/2026 10:14:55</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>06/09/2025 12:01:42</publishTime>
+      <publishTime>03/18/2026 10:21:54</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -5790,18 +5799,18 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>01/08/2026 14:16:37</publishTime>
+      <publishTime>03/18/2026 10:20:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>07/16/2025 10:23:13</publishTime>
+      <publishTime>03/18/2026 10:19:11</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html">
       <publishTime>01/30/2026 10:40:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">
-      <publishTime>07/16/2025 10:19:52</publishTime>
+      <publishTime>03/18/2026 10:23:01</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList_PDA.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5824,7 +5833,7 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldRepairCheckBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>06/13/2025 14:06:40</publishTime>
+      <publishTime>03/18/2026 10:18:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/璁惧淇濆吇璁板綍鍗�/Sb_EquipMaintainBill_PDA.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6118,6 +6127,9 @@
     <File Include="views/鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_Reply_MESExecptFeedBackBill.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
+    <File Include="views/鐢熶骇绠$悊/鎶曟枡闃查敊鍗�/Sc_FeedingErrorProofingBillList.html">
+      <publishTime>03/16/2026 18:08:28</publishTime>
+    </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
@@ -6409,7 +6421,7 @@
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>01/30/2026 16:57:31</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList_LookDown.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6605,7 +6617,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>03/26/2026 15:21:55</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6626,7 +6638,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/璁㈠崟鐘舵�佸垎甯�/Sc_OrderStateDistribution.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6816,7 +6828,7 @@
     </File>
     <File Include="views/绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserList.html">
       <publishTime>04/30/2021 08:42:02</publishTime>
-      <publishTime>08/07/2025 13:26:41</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserListEdit.html">
       <publishTime>12/03/2025 18:34:44</publishTime>
@@ -6936,7 +6948,7 @@
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>01/30/2026 16:57:31</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -7157,7 +7169,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html">
-      <publishTime>03/11/2026 21:03:58</publishTime>
+      <publishTime>03/12/2026 15:10:46</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit_HistoryRecord.html">
       <publishTime>06/09/2025 12:01:42</publishTime>
@@ -7247,7 +7259,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧鎶ヨ〃/Sb_EquipResumeCheckQuery.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>03/22/2026 18:55:50</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧鎶ヨ〃/SB_EquipRunningStatusReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7259,7 +7271,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧妗f/Gy_EquipFileMainEdit.html">
-      <publishTime>01/20/2026 15:30:17</publishTime>
+      <publishTime>03/17/2026 18:33:16</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html">
       <publishTime>07/16/2025 19:34:56</publishTime>
@@ -7574,7 +7586,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_FiveMenOneRingList_ICMO.html">
-      <publishTime>06/17/2025 12:45:32</publishTime>
+      <publishTime>03/24/2026 10:50:23</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_InspectionFormReport.html">
       <publishTime>06/25/2025 14:21:31</publishTime>
@@ -7670,7 +7682,7 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList2.html">
-      <publishTime>01/20/2026 15:36:14</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckReport_ZDQX.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7774,7 +7786,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鍗曞搧杩囩珯/Cj_ProcessItemStationPlatform.html">
-      <publishTime>09/05/2025 15:02:32</publishTime>
+      <publishTime>03/19/2026 17:46:16</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鍗曞搧杩囩珯/RetrospectiveQueryReport.html">
       <publishTime>08/07/2025 13:54:34</publishTime>
@@ -7795,13 +7807,13 @@
       <publishTime>01/15/2026 17:49:37</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_batchKeyElement.html">
-      <publishTime>03/06/2026 12:59:44</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_checkPackage.html">
       <publishTime>12/03/2025 18:34:44</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_checkPackage_Sec.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_checkSN.html">
       <publishTime>01/15/2026 17:49:37</publishTime>
@@ -7828,7 +7840,7 @@
       <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鍗曞搧杩囩珯_灏忓崼/Cj_SachetBarCodePrint.html">
-      <publishTime>02/25/2026 15:48:19</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鍗曞搧杩囩珯_灏忓崼/Cj_SaveSNByICMO.html">
       <publishTime>01/19/2026 18:32:27</publishTime>
@@ -7957,13 +7969,13 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillSync.html">
-      <publishTime>01/19/2026 18:32:27</publishTime>
+      <publishTime>03/20/2026 15:37:48</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CodingReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html">
-      <publishTime>03/02/2026 12:03:12</publishTime>
+      <publishTime>03/13/2026 17:01:16</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_QiaoYi.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -8074,7 +8086,7 @@
       <publishTime>02/02/2026 14:29:53</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeArrangement_PGPL.html">
-      <publishTime>02/02/2026 15:19:44</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -8084,7 +8096,7 @@
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>01/14/2026 15:45:37</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -8135,7 +8147,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html">
-      <publishTime>01/29/2026 14:08:19</publishTime>
+      <publishTime>03/22/2026 19:46:26</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">
       <publishTime>01/30/2026 17:56:39</publishTime>
@@ -8750,7 +8762,7 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>03/18/2026 17:47:28</publishTime>
     </File>
     <File Include="views/椤圭洰绠$悊/涓氱哗鎸囨爣/PM_YearEmployeeMoneyBill.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8906,7 +8918,7 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Add_Edit_Kf_OtherOutBill.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -8921,7 +8933,7 @@
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">
       <publishTime>04/14/2021 16:00:37</publishTime>
       <publishTime>04/14/2021 16:00:37</publishTime>
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>03/18/2026 17:49:09</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -9004,13 +9016,13 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillEdit.html">
-      <publishTime>02/25/2026 15:48:19</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillEdit.html">
-      <publishTime>02/25/2026 15:48:19</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -9031,13 +9043,16 @@
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
       <publishTime>04/14/2021 13:43:50</publishTime>
       <publishTime>04/14/2021 13:43:50</publishTime>
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>03/18/2026 17:46:02</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList_BarCodeNote.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList_LookDown.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
+    </File>
+    <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList_template.html">
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList_YP.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -9064,11 +9079,14 @@
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_QiaoYi.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
+    <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_template.html">
+      <publishTime>03/16/2026 18:08:28</publishTime>
+    </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillEdit.html">
-      <publishTime>02/25/2026 15:48:19</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">
-      <publishTime>09/15/2025 18:07:21</publishTime>
+      <publishTime>03/18/2026 17:41:05</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -9087,12 +9105,12 @@
       <publishTime>10/24/2025 11:53:31</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html">
-      <publishTime>09/15/2025 18:07:21</publishTime>
+      <publishTime>03/16/2026 18:08:28</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
       <publishTime>04/14/2021 13:24:27</publishTime>
       <publishTime>04/14/2021 13:24:27</publishTime>
-      <publishTime>10/24/2025 11:53:31</publishTime>
+      <publishTime>03/18/2026 17:30:20</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_CheckList_New.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -9180,7 +9198,7 @@
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">
       <publishTime>04/16/2021 10:03:54</publishTime>
       <publishTime>04/16/2021 10:03:54</publishTime>
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>03/26/2026 15:23:37</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -9279,7 +9297,7 @@
     </File>
     <File Include="Web.config">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>03/06/2026 13:02:08</publishTime>
+      <publishTime>03/24/2026 12:21:20</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 646764a..0c054ba 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -203,6 +203,7 @@
     <Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBill_Check_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_CheckList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_Check_PDA.html" />
+    <Content Include="views\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_BarCodeBill_HuaZhou.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Car.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostCenter.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostItem.html" />
@@ -639,6 +640,7 @@
     <Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
     <Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseDataCheck.html" />
     <Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_GeneralLookDown.html" />
+    <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier2_JD.html" />
     <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_MateNumRelation.html" />
     <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_MateNumRelationList.html" />
@@ -991,6 +993,7 @@
     <Content Include="views\杞﹂棿绠$悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBindingList.html" />
     <Content Include="views\杞﹂棿绠$悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
+    <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_BarCodePrint.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_zuituoxiaowei_cacheList.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_ShippingExport.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_SaveSNByICMO.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 48a262b..8cd2c06 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -6,7 +6,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>D:\鏅轰簯LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f9d0b7c..b826e83 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,6 +5,8 @@
     //var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/API/";        //鏉滆春鏈湴閰嶇疆
     //var WEBURL = "http://localhost:81/API/"           //缈佹稕娑涙湰鍦伴厤缃�
+     var WEBURL = "http://localhost:8082/API/";        //寮犵憺骞挎湰鍦伴厤缃�
+    // var WEBURL = "http://localhost:81/API/";          //闄堥晲鍝叉湰鍦伴厤缃�
     // var WEBURL = "http://localhost:8082/API/";        //寮犵憺骞挎湰鍦伴厤缃�
     var WEBURL = "http://localhost:81/API/";          //闄堥晲鍝叉湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //鏉庢灄淇婃湰鍦伴厤缃�
@@ -12,9 +14,9 @@
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
-    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //浣欐�濇澃鏈湴閰嶇疆*/
-    // var WEBURL = "http://localhost:81/API/";            // 闄堥晲鍝叉湰鍦伴厤缃�*/
-    //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�
+   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //浣欐�濇澃鏈湴閰嶇疆*/
+    //var WEBURL = "http://localhost:81/API/";            // 闄堥晲鍝叉湰鍦伴厤缃�*/
+     //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //濂ラ偊
     //var WEBURL = "http://10.1.4.155/API/";            //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
index 91931a0..b2ce05f 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -482,6 +482,9 @@
                         success: function (res) {
                             if (res.count == 1) {
                                 sBarCode = res.data[0].HCaseCode;
+                                hform.HBarCode_middle.push(res.data[0].HCaseCode);
+                            } else {
+                                layer.msg("闈炰腑绠辩爜锛屼笖鏈尮閰嶅埌涓鐮佷俊鎭紒鎵弿鏉$爜锛�" + sBarCode)
                             }
                         },
                         error: function (res) {
@@ -490,12 +493,14 @@
                             return;
                         }
                     });
+                } else {
+                    hform.HBarCode_middle.push(sBarCode);
                 }
                 if (!sBarCode) {
                     layer.msg('鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�', { icon: 2 });
                     return;
                 }
-                hform.HBarCode_middle.push(sBarCode);
+               
                 console.log(hform.HBarCode_middle)
                 console.log(sBarCode.toString().charAt(sBarCode.length - 1))
                 if (sBarCode.toString().charAt(sBarCode.length - 1) != "W") {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 55db939..8189c45 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -68,7 +68,7 @@
                                                 <label class="layui-form-label" id="BT_HWorksNumber">宸ュ巶浠g爜</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
-                                                        <!--<option value="0">鑸滄垚</option>-->
+                                                        
                                                     </select>
                                                 </div>
                                             </div>
@@ -112,7 +112,7 @@
                                                 <label class="layui-form-label" id="BT_HBarCodeType">鏉$爜绫诲瀷</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
-                                                        <!--<option value="11">鍞竴鏉$爜</option>-->
+                                                        
                                                     </select>
                                                 </div>
                                             </div>
@@ -293,7 +293,7 @@
             set_HBarCodeType();
 
             var rowdata = [{
-                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                "HMaterID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                 "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
             }];
             //鍒濆鍖栬〃鏍�
@@ -335,7 +335,7 @@
                 var AddRow = table.cache['mainTable'];
 
                 var NewRow = {
-                    "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                    "HMaterID": 0, "HSubID": 0, "HSupID": 0,"HSupNumber": "", "HSupName": "", "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                     "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
                 };
                 //console.log(NewRow);
@@ -370,6 +370,7 @@
                         break;
                 }
             });
+
             //琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
@@ -823,6 +824,7 @@
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
             //鍒濆鍖栬〃鍗曟彃浠�
             function set_InitFrom() {
                 laydate.render({
@@ -853,6 +855,7 @@
                     }
                 })
             }
+
             //鑾峰彇宸ュ巶浠g爜
             function set_HWorksNumber() {
                 //鑾峰彇宸ュ巶浠g爜
@@ -878,6 +881,7 @@
                     }
                 })
             }
+
             //鑾峰彇鏉$爜绫诲瀷
             function set_HBarCodeType() {
                 //鑾峰彇鏉$爜绫诲瀷浠g爜
@@ -924,6 +928,12 @@
                     , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', width: 200, event: 'HGroupNumber' }
                     , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
                     , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
+                    , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
+                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+                    , { field: 'HSupID', title: '渚涘簲鍟唅d', width: 100, hide: true }
+                    , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: 'HSupNumber', width: 120 }
+                    , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 120 }                   
                     , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
                     , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
                     , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
@@ -932,10 +942,7 @@
                     , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
                     , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
                     , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
-                    , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
-                    , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
-                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
-                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+                    , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }                   
                     , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
                     , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
@@ -969,6 +976,7 @@
                 option.data = rowdata;
                 table.render(option);
             }
+
             //鍒濆鏉$爜淇℃伅琛ㄦ牸
             function set_CountGrid() {
                 //琛ㄥご
@@ -1008,6 +1016,7 @@
                     }
                 };
             }
+
             //鍒濆鍖栨。妗堝垪琛ㄤ俊鎭〃鏍�
             function set_InitGrid2() {
                 //琛ㄥご
@@ -1077,10 +1086,11 @@
                     }
                 };
             }
+
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 option.data = [{
-                    "HMainID": 0, "HSubID": 0, "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+                    "HMainID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "",  "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
                     , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
                     , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
                     , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
@@ -1089,8 +1099,6 @@
                 table.render(option);
                 //鍒锋柊琛ㄦ牸鏁版嵁
                 DisPlay_HideColumn();
-                //DisPlay_HideColumn1();
-                //DisPlay_HideColumn2();
             }
 
             function set_AddFNew1() {
@@ -1102,17 +1110,13 @@
                 }];
                 table.render(option1);
                 //鍒锋柊琛ㄦ牸鏁版嵁
-                //DisPlay_HideColumn();
                 DisPlay_HideColumn1();
-                //DisPlay_HideColumn2();
             }
 
             function set_AddFNew2() {
                 option2.data = [];
                 table.render(option2);
                 //鍒锋柊琛ㄦ牸鏁版嵁
-                //DisPlay_HideColumn();
-                //DisPlay_HideColumn1();
                 DisPlay_HideColumn2();
             }
 
@@ -1128,6 +1132,7 @@
 
                 return [year, month, day].join('-');
             }
+
             //澧炲姞涓�琛�
             function btnAddLine(NewRow) {
                 //var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
@@ -1146,6 +1151,7 @@
                 //rows++;
                 layer.msg(get_MessageError('[3899-2-005]澧炲姞涓�琛屾寜閽紒', sessionStorage["HTranSlate"]))
             }
+
             //澶嶅埗涓�琛�
             function btnCopyLine(data) {
                 data[0].HQty = '';
@@ -1498,6 +1504,7 @@
                     });
                 }
             }
+
             //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -1605,7 +1612,7 @@
 
                                         childData = null;
                                     }
-                                    
+
 
                                     childPage = null;
                                     currRowIndex = 0;
@@ -1614,7 +1621,6 @@
                                 }
                             }
                         }
-
                     }
                     //#endregion
 
@@ -1901,6 +1907,46 @@
                                 }
                             });
                         }
+                        //渚涘簲鍟嗕唬鐮�
+                        if (obj.event === 'HSupNumber')  //渚涘簲鍟嗕唬鐮�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HSupID: checkStatus.data[0].HItemID,
+                                        HSupNumber: checkStatus.data[0].渚涘簲鍟嗕唬鐮�,
+                                        HSupName: checkStatus.data[0].渚涘簲鍟嗗悕绉�
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         obj.event = "";
                         return false;
                     }
@@ -2125,6 +2171,7 @@
                     }
                 });
             }
+
             //鐧诲綍鏍规嵁ic鍗″彿
             function loginByICCard(HBarCode) {
                 var index = layer.load();
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_HuaZhou.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_HuaZhou.html"
new file mode 100644
index 0000000..7e3c037
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_HuaZhou.html"
@@ -0,0 +1,2526 @@
+锘�<!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/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/MESLanguage.js"></script>
+    <style type="text/css">
+
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 35%;
+        }
+
+        .layui-input-block {
+            margin-left: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-input-block">
+                                <button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>
+                                <button type="button" class="layui-btn" id="ToolCreate" lay-submit="" lay-filter="ToolCreate">鐢熸垚</button>
+                                <button type="button" class="layui-btn" id="ToolReset" lay-submit="" lay-filter="ToolReset">閲嶇疆</button>
+                                <button type="button" class="layui-btn" id="ToolStock" lay-submit="" lay-filter="ToolStock">搴撳瓨</button>
+                                <button type="button" class="layui-btn" id="ToolSynch" lay-submit="" lay-filter="ToolSynch">鍚屾璧勬枡</button>
+                                <button type="button" class="layui-btn" id="ToolBatch" lay-submit="" lay-filter="ToolBatch">鎵规</button>
+                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+                            </div>
+                        </div>
+
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <!--<h1 style="text-align:center;"><b>鏉$爜鐢熸垚</b></h1>-->
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" id="BT_HOrgID">缁勭粐</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HOrgID" id="HOrgID" lay-filter="HOrgID" class="layui-input" value="" style="float:left;width:150px">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" id="BT_HWorksNumber">宸ュ巶浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
+                                                        
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" id="BT_HDate">鏃ユ湡</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" id="BT_HSourceBillType">婧愬崟绫诲瀷</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" class="layui-input" value="" style="float:left;width:150px">
+                                                        <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>
+                                                        <option value="8">閿�鍞��璐у崟</option>
+                                                        <option value="9">鐢熶骇閫�鏂欏崟</option>
+                                                        <option value="10">宸ュ簭娴佽浆鍗�</option>
+                                                        <option value="11">閿�鍞嚭搴撳崟</option>
+                                                        <option value="12">棰嗘枡鍑哄簱鍗�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" id="BT_HSourceBillNo">閫夊崟鍙�<label style="color:red">*</label></label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo"  class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" id="BT_HBarCodeType">鏉$爜绫诲瀷</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
+                                                        
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="layui-tab layui-tab-card" lay-filter="tab-TabTest">
+                            <ul class="layui-tab-title">
+                                <li lay-id="1" class="layui-this">鐗╂枡淇℃伅</li>
+                                <li lay-id="2">鏉$爜淇℃伅</li>
+                                <li lay-id="3">妗f鍒楄〃</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                                </div>
+                            </div>
+                        </div>
+
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-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>
+                        <script type="text/html" id="toolbarDemo1">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo2">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="switchTpl">
+                            <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+                            <input type="checkbox" name="checkbox" value="{{d.HGiveAwayFlag}}" lay-skin="primary" lay-filter="HGiveAwayFlag" {{ d.HGiveAwayFlag == 1 ? 'checked' : '' }}>
+                        </script>
+                        <script type="text/html" id="switchTp2">
+                            <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+                            <input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag1">
+                        </script>
+                        <script type="text/html" id="switchTp3">
+                            <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+                            <input type="checkbox" name="checkbox" value="{{d.HExpirationDateFlag}}" lay-skin="primary" lay-filter="HExpirationDateFlag" {{ d.HExpirationDateFlag == 1 ? 'checked' : '' }}>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+        var childPage = null;                       //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+        var currRowIndex = 0;                       //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+        var childData = null;                       //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+        //#endregion
+
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id(椤甸潰鐩存帴璋冩暣鎵撳嵃鏃犻渶鐧诲綍鍔熻兘锛�1.浣滀负鍗曟嵁鍙�2.(1,2,3)@(1,2,3)浼犲叆杩欑鏍煎紡鐨勪富id鍜屽瓙id锛�)
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+            var loginCard = params[params[4]]; //鑷姩鐧诲綍ic鍗″彿
+            var HOrgID = params[params[5]];//鐧诲綍缁勭粐id
+            //var HOrgName = params[params[6]];//鐧诲綍缁勭粐鍚嶇О
+            var HTranSlate = params[params[6]];//璇█
+        }
+
+        var OptionData = [];
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //鏌ヨ鏉′欢
+            var option = [];
+            var option1 = [];
+            var option2 = [];
+            var sWhere = "";
+            var sBillType = "3801";
+            var HModName = "Gy_BarCodeBill";
+            var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁¢噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID", "鎿嶄綔鍛業D", "鐝粍ID", "澶栫鏁�", "閽㈠嵎鎹嗗寘鍙�", "鐐夊彿", "鍘傚晢", "瀹㈡埛浠g爜", "瀹㈡埛鍚嶇О", "閿�鍞鍗曞彿", "鐢熶骇鏃ユ湡", "淇濊川鏈熻嚦", "鐑鐞�", "杈呭姪灞炴�т唬鐮�", "杈呭姪灞炴�у悕绉�", "杈呭崟浣嶆暟閲�", "鏄惁鍚敤淇濊川鏈�", "鏄惁璧犲搧", "杩涙枡鏃ユ湡"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+            var HMaterID = "";
+            var HBatchNo = "";
+            var BatchNoArray; //鐢ㄦ潵瀛樺偍鑾峰彇鍒扮殑鎵瑰彿锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
+            var HMinQty2 = 0; //鐢ㄦ潵瀛樺偍杈撳叆鐨勬渶灏忓寘瑁呮暟锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
+
+            var HMaterInfo = "";  //瀛樺偍鐗╂枡淇℃伅
+            var HBarInfo = ""; //瀛樺偍鏉$爜淇℃伅
+            var HFileList = "";  //瀛樺偍妗f鍒楄〃
+            //#endregion
+
+            //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+            element.on('tab(tab-TabTest)', function (data) {
+                HMaterInfo = table.cache['mainTable'];
+                var cur_title = data.elem.context.innerText;
+                if (cur_title == "鐗╂枡淇℃伅") {
+                    HModName = "Gy_BarCodeBill";
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    table.reload('mainTable', {
+                        data: HMaterInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });
+
+                } else if (cur_title == "鏉$爜淇℃伅") {
+                    HModName = "Gy_BarCodeBill_1";
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn1();
+                    table.reload('mainTable1', {
+                        data: HBarInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });
+                } else if (cur_title == "妗f鍒楄〃") {
+                    HModName = "Gy_BarCodeBill_2";
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn2();
+                    //鍔犺浇妗f鍒楄〃
+                    table.reload('mainTable2', {
+                        data: HFileList // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });
+                }
+            })
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鑷姩鐧诲綍
+            if (loginCard != undefined) {
+                var login_result = true;
+                loginByICCard(loginCard)
+                if (login_result) {
+                    $("#HSourceBillType").val(HSouceBillType);
+                    form.render('select');
+                    //$("#HSourceBillNo").val(linterid);
+                }
+                
+            }
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+            //鍔犺浇缁勭粐鏁版嵁
+            set_HOrg();
+            //鍔犺浇宸ュ巶浠g爜鏁版嵁
+            set_HWorksNumber();
+            //鍔犺浇鏉$爜绫诲瀷鏁版嵁
+            set_HBarCodeType();
+
+            var rowdata = [{
+                "HMaterID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "", "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
+            }];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            set_CountGrid();
+            set_InitGrid2();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鏂板
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));      //鍗曟嵁鏃ユ湡
+                set_AddFNew();
+                set_AddFNew1();
+                set_AddFNew2();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid(linterid);
+            }
+            else {
+                layer.alert(get_MessageError("[0000-2-049]鏈煡鎿嶄綔绫诲瀷锛�", sessionStorage["HTranSlate"]), { icon: 5 });
+            }
+
+            initFunction(1, "Gy_BarCodeBill", sessionStorage["HTranSlate"]);
+            form.render('select');
+
+            //鑷姩鐧诲綍鍚庨�変腑婧愬崟鍔ㄤ綔
+            if (loginCard != undefined && login_result == true) {
+                let HSourceBillType = getSupType();
+                getBarCodeByHBillNo(linterid, HSourceBillType)
+
+            }
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+            //澶村伐鍏锋爮
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];
+
+                var NewRow = {
+                    "HMaterID": 0, "HSubID": 0, "HSupID": 0,"HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "","HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
+                };
+                //console.log(NewRow);
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn(0);
+                        break;
+                }
+            });
+
+            table.on('toolbar(mainTable1)', function (obj) {
+                switch (obj.event) {
+                    //鍒楄缃�
+                    case 'set_HideColumn1':
+                        get_HideColumn(1);
+                        break;
+                }
+            });
+
+            table.on('toolbar(mainTable2)', function (obj) {
+                switch (obj.event) {
+                    //鍒楄缃�
+                    case 'set_HideColumn2':
+                        get_HideColumn(2);
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                //#region 淇敼琛� 鏃堕棿
+
+                var data = obj.data;
+                //鐢熶骇鏃ユ湡
+                if (obj.event == 'HProduceDate') {
+                    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 == 'HExpiryDate') {
+                    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
+            });
+
+            //鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+                switch (field) {
+                    case "HQty":  //鏁伴噺
+                        value = isNaN(value) ? 0 : value;
+                        var HMinQty = isNaN(data.HMinQty) ? 0 : data.HMinQty;
+                        if (HMinQty == 0) {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HQty: value,                                   //鏁伴噺
+                                HBQty: 0,                                      //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                            });
+                        }
+                        else {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HQty: value,                                   //鏁伴噺
+                                HBQty: Math.ceil(value / HMinQty),             //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                            });
+                        }
+                        break;
+                    case "HMinQty":  //鏈�灏忓寘瑁呮暟閲�
+                        value = isNaN(value) ? 0 : value;
+                        HMinQty2 = value;   //缁欐壒娆℃寜閽姛鑳戒腑鐨勬渶灏忓寘瑁呮暟璧嬪��
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        if (HQty == 0) //闄ゆ暟涓�0
+                        {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HMinQty: value,                                //鏈�灏忓寘瑁呮暟閲�
+                                HBQty: 0,                                      //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                            });
+                        }
+                        else {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HMinQty: value,                                //鏈�灏忓寘瑁呮暟閲�
+                                HBQty: Math.ceil(HQty / value),                //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                            });
+                        }
+
+                        break;
+                    default:
+                }
+            });
+
+            //涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂
+            form.on('select(HSourceBillType)', function (data) {
+                $("#HSourceBillNo").val("");
+            });
+
+            function getSupType() {
+                var type = $("#HSourceBillType").val();
+                switch (type) {
+                    case '1':
+                        return "鐢熶骇璁㈠崟";
+                        break;
+                    case '2':
+                        return "鐢熶骇姹囨姤鍗�";
+                        break;
+                    case '3':
+                        return "閲囪喘璁㈠崟";
+                        break;
+                    case '4':
+                        return "鏀舵枡閫氱煡鍗�";
+                        break;
+                    case '5':
+                        return "濮斿璁㈠崟";
+                        break;
+                    case '6':
+                        return "鐢熶骇鍏ュ簱鍗�";
+                        break;
+                    case '7':
+                        return "閲囪喘鍏ュ簱鍗�";
+                        break;
+                    case '8':
+                        return "閿�鍞��璐у崟";
+                        break;
+                    case '9':
+                        return "鐢熶骇閫�鏂欏崟";
+                        break;
+                    case '10':
+                        return "宸ュ簭娴佽浆鍗�";
+                        break;
+                    case '11':
+                        return '閿�鍞嚭搴撳崟';
+                        break;
+                    case '12':
+                        return '棰嗘枡鍑哄簱鍗�';
+                        break;
+                }
+            }
+
+            //琛ㄥご淇℃伅婧愬崟淇℃伅寮圭獥
+            form.on('submit(HSourceBillNoList)', function () {
+                if ($("#HSourceBillType").val() == 0 || $("#HSourceBillType").val() == null) {
+                    return layer.msg(get_MessageError('[0000-2-050]璇烽�夋嫨鍗曟嵁绫诲瀷', sessionStorage["HTranSlate"]));
+                }
+                //鑾峰彇缁勭粐ID
+                var SetHOrgID = $("#HOrgID").find("option:selected").val();
+                //椤甸潰灞�-鑷畾涔�
+                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&HOrgID=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
+                url = encodeURI(url);
+                //alert(url);
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '' + getSupType() + '鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['95%', '95%'],
+                    maxmin: true,
+                    content: [url, 'yes'],
+                    btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])],
+                    btn1: function (index, layero) {
+                        HBarInfo = ""; //瀛樺偍鏉$爜淇℃伅
+                        HFileList = "";  //瀛樺偍妗f鍒楄〃
+                        $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+                        element.tabChange('tab-TabTest', '1');
+
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('layTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鍗曟嵁鏁版嵁', sessionStorage["HTranSlate"]));
+                        }
+                        var list = [];
+                        var BillSelect = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i].閮ㄩ棬 != "" && checkStatus.data[i].閮ㄩ棬 != null) {
+                                list.push(checkStatus.data[i].閮ㄩ棬)
+                            }
+                            BillSelect.push({ BillType: checkStatus.data[i].HBillType, BillTitle: getSupType(), BillNo: checkStatus.data[i].鍗曟嵁鍙�, "BillMainID": checkStatus.data[i].HMainID, "BillSubID": checkStatus.data[i].HSubID, "SPID": 0, "BatchNo": "", "HAuxPropID": 0 });
+                        }
+                        if (isAllEqual(list))  //涓嶅厑璁搁�夋嫨涓嶅悓閮ㄩ棬
+                        {
+                            //鑾峰彇閫変腑鏁版嵁
+                            var GrdSelectData = JSON.stringify(BillSelect);
+                            //鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
+                            var HSourceBillType = $("#HSourceBillType").find("option:selected").html();
+                            //鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
+                            var HBarCodeType = $("#HBarCodeType").find("option:selected").html();
+                            //鑾峰彇褰撳墠鐧诲綍浜哄憳
+                            var UserName = sessionStorage["HUserName"];
+                            var Str = GrdSelectData + ";" + HSourceBillType + ";" + HBarCodeType + ";" + UserName;
+                            //閫氳繃閫夋嫨鐨勬簮鍗曚富瀛愬唴鐮佹煡鎵捐缁嗕俊鎭�
+                            $.ajax({
+                                type: "post",
+                                url: GetWEBURL() + "/Sc_BarCode/SelectReportFromBillList",
+                                //contentType: 'application/json',
+                                async: false,
+                                dataType: "json",
+                                data: { "msg": Str },
+                                //traditional: true,
+                                success: function (result) {
+                                    HMaterID = result.list[0].HMaterID;
+                                    HBatchNo = result.list[0].HBatchNo;
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        for (let i = 0; i < result.list.length; i++) {
+                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0]  //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟
+                                            if (result.list[i].HMinQty != 0) {
+                                                result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
+                                            }
+                                            result.list[i].HEmpID = sessionStorage["HEmpID"]
+                                            result.list[i].HEmpNumber = sessionStorage["HEmpNumber"]
+                                            result.list[i].HEmpName = sessionStorage["HEmpName"]
+                                        }
+
+                                        BatchNoArray = result.list;  //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
+                                        //for (let i = 0; i < result.list.length; i++) {
+                                        //    result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
+                                        //}
+                                        console.log(result.list[0]);
+                                        table.reload('mainTable', {
+                                            data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                        });
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                    }
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(get_MessageError("[3899-2-001]涓嶅厑璁搁�夋嫨涓嶅悓鐨勯儴闂ㄦ暟鎹�!", sessionStorage["HTranSlate"]), { time: 1 * 2000, icon: 5 });
+                        }
+
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //#region 鍥炶溅閫夋嫨婧愬崟
+            $('#HSourceBillNo').on('keydown', function (event) {
+                var HSourceBillNo = $('#HSourceBillNo').val();//锛堟簮鍗曞崟鎹彿锛�
+                //$("#HSourceBillType").val(2);
+                //form.render('select');
+                if (event.keyCode == 13) {
+                    var ajaxLoad = layer.load();
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    if (HSourceBillNo == "") {
+                        layer.close(ajaxLoad);
+                        return;
+                    }
+                    let HSourceBillType = getSupType();
+                    getBarCodeByHBillNo(HSourceBillNo, HSourceBillType)
+                }
+            });
+            //#endregion
+
+            function isAllEqual(array) {
+                if (array.length > 0) {
+                    return !array.some(function (value, index) {
+                        return value !== array[0];
+                    });
+                } else {
+                    return true;
+                }
+            }
+
+            //鎵撳嵃
+            form.on('submit(ToolPrint)', function (data) {
+                get_PrintReport();
+            })
+
+            //鏉$爜鐢熸垚
+            form.on('submit(ToolCreate)', function (data) {
+                $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
+                for (var i = 0; i < table.cache['mainTable'].length; i++) {
+                    table.cache['mainTable'][i]["HDate"] = $("#HDate").val();
+                    if (table.cache["mainTable"][i].HMaterName!=null&&(table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1)) {
+                        table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                    }
+                    if (table.cache["mainTable"][i].HMaterModel!=null&&(table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1)) {
+                        table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                    }
+                    if (table.cache["mainTable"][i].HPinfan!=null&&("HPinfan" in table.cache["mainTable"][i])) {
+                        if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
+                            table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                        }
+                    }                    
+                }
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                HMaterInfo = table.cache['mainTable'];
+                //鐗╂枡鏄庣粏淇℃伅涓嶄负绌哄垽鏂�
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+                    return false;
+                }
+                //鑾峰彇閫夋嫨鐨勭粍缁�
+                var HOrgType = $("#HOrgID").find("option:selected").html();
+                //鑾峰彇閫夋嫨鐨勫伐鍘備唬鐮�
+                var CampanyName = $("#HWorksNumber").find("option:selected").html();
+                if (CampanyName == "" || CampanyName == null) {
+                    CampanyName = "xxx";
+                }
+                //鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
+                var HSourceBillType = $("#HSourceBillType").find("option:selected").html();
+                //鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
+                var HSelectBarCodeType = $("#HBarCodeType").find("option:selected").html();
+                //鑾峰彇褰撳墠鐧诲綍浜哄憳
+                var UserName = sessionStorage["HUserName"];
+                //var UserName = "Admin";
+                var sMainSub = sSubStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' + CampanyName + ';' + UserName;
+                SaveBarCodeCreate(sMainSub);
+            })
+
+            //閲嶇疆
+            form.on('submit(ToolReset)', function (data) {
+                layer.confirm(get_MessageError('[3899-2-002]纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�', sessionStorage["HTranSlate"]), {
+                    btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])],
+                    title: get_MessageError("[0000-2-009]鎻愮ず", sessionStorage["HTranSlate"]),
+                    icon: 3,
+                }, function (index) {
+                    location.replace('Gy_BarCodeBill.html?OperationType=1');
+                })
+            })
+
+            //搴撳瓨
+            form.on('submit(ToolStock)', function (data) {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐗╂枡璧勬枡',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/MaterialInfo.html', 'yes'],
+                    btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])],
+                    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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                        }
+
+                        var data = checkStatus.data;
+                        var arr = [];
+                       
+                        for (var i = 0; i < data.length; i++) {
+                            arr.push({
+                                "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠g爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+                                , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+                                , "HUnitNumber": data[i].璁¢噺鍗曚綅浠g爜, "HUnitName": data[i].璁¢噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+                                , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
+                                , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
+                                , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd")
+                                , "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
+                                , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+                                , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+                                , "HCheckEmpName": ""
+                            })
+                        }
+                      
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        table.reload('mainTable', {
+                            data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                        });
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    }
+                });
+            });
+
+            //鍚屾璧勬枡
+            form.on('submit(ToolSynch)', function (data) {
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_BarCode/Sync_data',
+                    type: "GET",
+                    async: false,
+                    //data: { "sWhere": SeachFilter(sWhere1) },
+                    success: function (data1) {
+                        if (data1.code == 1) {
+                            layer.alert(data1.Message)
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert(data1.Message, { icon: 5 });
+                    }
+                });
+            });
+
+            //鎵规
+            form.on('submit(ToolBatch)', function (data) {
+                if (HMinQty2 == 0 && HMaterID) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Sc_BarCode/Batch',
+                        type: "GET",
+                        async: false,
+                        data: { "HMaterID": HMaterID, "HBatchNo": HBatchNo },
+                        success: function (data1) {
+                            if (data1.code == 1) {
+                                BatchNoArray[0].HBatchNo = data1.data
+                                BatchNoArray[0].HMinQty = HMinQty2
+                                console.log(BatchNoArray)
+                                table.reload('mainTable', {
+                                    data: BatchNoArray // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                });
+                                layer.alert(get_MessageError(data1.Message, sessionStorage["HTranSlate"]))
+                            }
+                        }, error: function () {
+                            layer.alert(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5 });
+                        }
+                    });
+                } else {
+                    layer.alert(get_MessageError('[3899-2-004]璇锋偍鍦ㄨ幏鍙栨壒鍙峰悗鍦ㄨ緭鍏ユ渶灏忓寘瑁呮暟 ^_^||', sessionStorage["HTranSlate"]))
+                }
+            });
+
+            //閫�鍑�
+            form.on('submit(ToolExit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+
+            //鑾峰彇缁勭粐
+            function set_HOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            form.render('select');
+                        }
+                        $('#HOrgID').find("option[value=" + sessionStorage["OrganizationID"] + "]").attr("selected", true);
+                        form.render('select') //鍐嶆娓叉煋
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇宸ュ巶浠g爜
+            function set_HWorksNumber() {
+                //鑾峰彇宸ュ巶浠g爜
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Sc_BarCode/GetHWorksNumberBill",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.list;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + i + '">' + data[i] + '</option>';
+                            }
+                            $("#HWorksNumber").append(Organization);
+                            form.render('select');
+                            if (result.list[0] != "" && result.list[0] != null) {
+                                $('#HWorksNumber').find("option[value=" + result.list[0] + "]").attr("selected", true);
+                                form.render('select') //鍐嶆娓叉煋
+                            }
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鏉$爜绫诲瀷
+            function set_HBarCodeType() {
+                //鑾峰彇鏉$爜绫诲瀷浠g爜
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Sc_BarCode/GetHBarCodeTypeBill",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.list;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + i + '">' + data[i] + '</option>';
+                            }
+                            $("#HBarCodeType").append(Organization);
+                            form.render('select');
+                        }
+                        $('#HBarCodeType').find("option[value=" + result.list[0] + "]").attr("selected", true);
+                        form.render('select') //鍐嶆娓叉煋
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鍒濆鍖栫墿鏂欎俊鎭〃鏍�
+            function set_InitGrid() {
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+                    , { field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
+                    , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
+                    , { field: 'HSourceBillSEQ', title: '婧愬崟琛屽彿', width: 100, hide: true }
+                    , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterNumber', width: 200 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+                    , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', edit: 'text', width: 200 }
+                    , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', width: 200 }
+                    , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
+                    , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber' }
+                    , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
+                    , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
+                    , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', width: 200, event: 'HGroupNumber' }
+                    , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
+                    , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
+                    , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
+                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', edit: 'text', event: 'HCusName', width: 120 }
+                    , { field: 'HSupID', title: '渚涘簲鍟唅d', width: 100, hide: true }
+                    , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: 'HSupNumber', width: 120 }
+                    , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', edit: 'text', event: 'HSupName',width: 120 }
+                    , { field: 'JMHSupID', title: '閲戦┈渚涘簲鍟咺D', width: 100, hide: true }
+                    , { field: 'JMHSupNumber', title: '閲戦┈渚涘簲鍟嗕唬鐮�', edit: 'text', event: 'JMHSupNumber', width: 120 }
+                    , { field: 'JMHSupName', title: '閲戦┈渚涘簲鍟嗗悕绉�', edit: 'text', event: 'JMHSupName', width: 120 }
+                    , { field: 'HTH', title: '鍚堝悓鍙�', width: 120, edit: 'text' }
+                    , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+                    , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
+                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
+                    , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', totalRow: true, width: 100 }
+                    , { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
+                    , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
+                    , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
+                    , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
+                    , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }                   
+                    , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                    , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
+                    , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
+                    , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
+                    , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+                    , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
+                    , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
+                    , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
+                    , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitNumber', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 100 }
+                    , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
+                    , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
+                    , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
+                    , { field: 'HDate', title: '鏉$爜鏃ユ湡', width: 100, hide: true }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , totalRow: true
+                    , cellMinWidth: 75
+                    , height: 'full-325'
+                    , cols: [columns]
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , done: function (res, curr, count) {
+                    }
+                };
+                option.data = rowdata;
+                table.render(option);
+            }
+
+            //鍒濆鏉$爜淇℃伅琛ㄦ牸
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HBarCode2', title: '鏉$爜缂栧彿', width: 100 }
+                    , { field: 'HMaterNumber2', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: 'HMaterName2', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: 'HMaterModel2', title: '瑙勬牸鍨嬪彿', width: 100 }
+                    , { field: 'HAuxPropNumber2', title: '杈呭姪灞炴�т唬鐮�', width: 100 }
+                    , { field: 'HAuxPropName2', title: '杈呭姪灞炴��', event: 'HWHCode', width: 120 }
+                    , { field: 'HGiveAwayFlag2', title: '鏄惁璧犲搧', width: 120, templet: '#switchTpl', unresize: false }
+                    , { field: 'HUnitCode2', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                    , { field: 'HUnitName2', title: '璁¢噺鍗曚綅', width: 120 }
+                    , { field: 'HQty2', title: '鏁伴噺', width: 120 }
+                    , { field: 'HDate2', title: '杩涙枡鏃ユ湡', width: 120 }
+                    , { field: 'HCusNumber2', title: '瀹㈡埛浠g爜', width: 120 }
+                    , { field: 'HCusName2', title: '瀹㈡埛', width: 120 }
+                    , { field: 'HSourceBillNo2', title: '婧愬崟鍗曞彿', width: 120 }
+                    , { field: 'HSeOrderBillNo2', title: '閿�鍞鍗曞彿', width: 120 }
+                    , { field: 'HRemark2', title: '澶囨敞', width: 120 }
+                    , { field: 'HMTONo2', title: '璁″垝璺熻釜鍙�', width: 120 }
+                    , { field: 'HShowDate2', title: '鏃ユ湡', width: 100 }
+                    , { field: 'HInnerBillNo2', title: '鍐呴儴閲囪喘璁㈠崟鍙�', width: 100 }
+                    , { field: 'HMaker2', title: '鍒跺崟浜�', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , toolbar: '#toolbarDemo1'
+                    , page: false
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 'full-325'
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+
+            //鍒濆鍖栨。妗堝垪琛ㄤ俊鎭〃鏍�
+            function set_InitGrid2() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
+                    , { field: 'hmainid', title: 'hmainid', width: 100, hide: true }
+                    , { field: 'hsubid', title: 'hsubid', width: 100, hide: true }
+                    , { field: 'HinterID', title: 'HinterID', width: 100, hide: true }
+                    , { field: '鏉$爜绫诲瀷', title: '鏉$爜绫诲瀷', width: 100 }
+                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 120 }
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+                    , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
+                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
+                    , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+                    , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 120 }
+                    , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 120 }
+                    , { field: '鎵瑰彿', title: '鎵瑰彿', width: 120 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 120 }
+                    , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 120 }
+                    , { field: '鏄惁璧犲搧', title: '鏄惁璧犲搧', width: 100 }
+                    , { field: 'DeptID', title: '杞﹂棿ID', width: 100, hide: true }
+                    , { field: '杞﹂棿', title: '杞﹂棿', width: 120 }
+                    , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 100, hide: true }
+                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+                    , { field: '瀹㈡埛鏉$爜缂栧彿', title: '瀹㈡埛鏉$爜缂栧彿', width: 120 }
+                    , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 120 }
+                    , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 120 }
+                    , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 120 }
+                    , { field: '閿�鍞鍗曡鍙�', title: '閿�鍞鍗曡鍙�', width: 120 }
+                    , { field: '鎵樺彿', title: '鎵樺彿', width: 120 }
+                    , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 100 }
+                    , { field: '鏉$爜鏃ユ湡', title: '鏉$爜鏃ユ湡', width: 120 }
+                    , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 120 }
+                    , { field: '鐢熶骇鍏ュ簱鍗曞彿', title: '鐢熶骇鍏ュ簱鍗曞彿', width: 120 }
+                    , { field: '鐢熶骇鍏ュ簱娆℃暟', title: '鐢熶骇鍏ュ簱娆℃暟', width: 100 }
+                    , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 120 }
+                    , { field: '閿�鍞嚭搴撳崟鍙�', title: '閿�鍞嚭搴撳崟鍙�', width: 120 }
+                    , { field: '閿�鍞嚭搴撴鏁�', title: '閿�鍞嚭搴撴鏁�', width: 100 }
+                    , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 100 }
+                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
+                    , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                    , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 100 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+                    , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120 }
+                    , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 100 }
+                    , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true }
+                    , { field: '鐢熸垚缁勭粐', title: '鐢熸垚缁勭粐', width: 120 }
+                ];
+                option2 = {
+                    id: 'mainTable2'
+                    , elem: '#mainTable2'
+                    , toolbar: '#toolbarDemo2'
+                    , page: false
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 'full-325'
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                option.data = [{
+                    "HMainID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "", "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+                    , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
+                    , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
+                    , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
+                }];
+                table.render(option);
+                //鍒锋柊琛ㄦ牸鏁版嵁
+                DisPlay_HideColumn();
+            }
+
+            function set_AddFNew1() {
+                option1.data = [{
+                    "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
+                    , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
+                    , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
+                    , "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
+                }];
+                table.render(option1);
+                //鍒锋柊琛ㄦ牸鏁版嵁
+                DisPlay_HideColumn1();
+            }
+
+            function set_AddFNew2() {
+                option2.data = [];
+                table.render(option2);
+                //鍒锋柊琛ㄦ牸鏁版嵁
+                DisPlay_HideColumn2();
+            }
+
+            //鏃ユ湡鏍煎紡鍖�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+
+            //澧炲姞涓�琛�
+            function btnAddLine(NewRow) {
+                //var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                //buttonArr = [];//娓呯┖鏁扮粍
+                //for (var i = 0; i < tableBak.length; i++) {
+                //    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                //}
+                //buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                //table.reload("mainTable", {
+                //    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                //})
+                //table.cache["mainTable"].push(AddRow[rows]);
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+                //rows++;
+                layer.msg(get_MessageError('[3899-2-005]澧炲姞涓�琛屾寜閽紒', sessionStorage["HTranSlate"]))
+            }
+
+            //澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                data[0].HQty = '';
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.msg(get_MessageError("[0000-2-001]璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒", sessionStorage["HTranSlate"]));
+                }
+                else if (data.length > 1) {
+                    layer.msg(get_MessageError("[0000-2-002]鍙兘閫夋嫨澶嶅埗涓�琛岋紒", sessionStorage["HTranSlate"]));
+                }
+                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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn(value) {
+                var colName = "";
+                if (value == 0) {
+                    HModName = "Gy_BarCodeBill";
+                    for (var i = 1; i < option.cols[0].length - 1; i++) {
+                        colName += option.cols[0][i]["title"] + ",";
+                    }
+                } else if (value == 1) {
+                    HModName = "Gy_BarCodeBill_1";
+                    for (var i = 1; i < option1.cols[0].length - 1; i++) {
+                        colName += option1.cols[0][i]["title"] + ",";
+                    }
+                } else if (value == 2) {
+                    HModName = "Gy_BarCodeBill_2";
+                    for (var i = 1; i < option2.cols[0].length - 1; i++) {
+                        colName += option2.cols[0][i]["title"] + ",";
+                    }
+                }
+
+                var contentUrl = "";
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    ,btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                    , btn1: function (index, laero) {
+                        if (value == 0) {
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                        } else if (value == 1) {
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn1();
+                        } else if (value == 2) {
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn2();
+                        }
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� 鐗╂枡淇℃伅
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� 鏉$爜淇℃伅
+            function DisPlay_HideColumn1() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option1.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option1.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option1.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option1.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option1.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option1.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option1.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option1.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option1.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option1.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option1.cols[0].length - 1; i++) {
+                                if (option1.cols[0][i]["fixed"] != null) {
+                                    option1.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option1.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option1.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option1);
+                        } else {
+                            table.render(option1);
+                        }
+                    }, error: function () {
+                        layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� 妗f鍒楄〃
+            function DisPlay_HideColumn2() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option2.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option2.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option2.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option2.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option2.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option2.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option2.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option2.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option2.cols[0].length - 1; i++) {
+                                if (option2.cols[0][i]["fixed"] != null) {
+                                    option2.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option2.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option2);
+                        } else {
+                            table.render(option2);
+                        }
+                    }, error: function () {
+                        layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                })
+            }
+
+            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm(get_MessageError('[0000-1-003]鐪熺殑鍒犻櫎琛屼箞', sessionStorage["HTranSlate"]), function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg(get_MessageError('[0000-2-003]棣栬鏃犳硶鍒犻櫎锛侊紒锛�', sessionStorage["HTranSlate"]));
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            table.reload('mainTable', { data: oldData });
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
+                    if (event.key != "F7") {
+                        var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                        if (obj.event == "HMaterNumber") {                           //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+                            if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                                if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                                    var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                                    var innerHeight = window.innerHeight;
+                                    var top = offset.top + 0.05 * innerHeight;
+                                    var left = offset.left;
+                                    if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                                        top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                                    }
+                                    layer.open({
+                                        type: 2                                                                                     //寮圭獥绫诲瀷
+                                        , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                                        , area: ['25%', '30%']                                                                      //澶у皬
+                                        , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                                        , offset: [top, left]
+                                        , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                                        //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                                        , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                                        , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                                        , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                                        , success: function (layero, index) {
+                                            setTimeout(function () {
+                                                var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                                currRowIndex = 0;
+                                                var tableView = "h_v_Gy_MaterialList";
+                                                var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                                                childPage.getData(childSWhere, tableView);
+                                            }, 200);
+                                        }
+                                        , end: function () {
+                                            obj.event = "";
+                                            childPage = null;
+                                            currRowIndex = 0;
+                                            if (childData != null) {
+                                                obj.update({
+                                                    "HMaterID": childData.HItemID,
+                                                    "HMaterNumber": childData.鐗╂枡浠g爜,
+                                                    "HMaterName": childData.鐗╂枡鍚嶇О,
+                                                    "HMaterModel": childData.瑙勬牸鍨嬪彿,
+                                                    "HUnitID": childData.HUnitID,
+                                                    "HUnitNumber": childData.璁¢噺鍗曚綅浠g爜,
+                                                    "HUnitName": childData.璁¢噺鍗曚綅鍚嶇О
+                                                });
+
+                                                if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉$爜') {
+                                                    obj.update({
+                                                        HQty: 1,    //鏁伴噺
+                                                        HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
+                                                        HBQty: 1    //绠辨暟
+                                                    });
+                                                }
+
+                                                childData = null;
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    setTimeout(function () {
+                                        var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                        currRowIndex = 0;
+                                        var tableView = "h_v_Gy_MaterialList";
+                                        var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%')  order by 鐗╂枡浠g爜 desc";
+                                        childPage.getData(childSWhere, tableView);
+                                    }, 200);
+                                }
+                            } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                                if (event.key == "ArrowUp") {
+                                    currRowIndex--;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "ArrowDown") {
+                                    currRowIndex++;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "Enter") {
+                                    //鎵嬪姩澶辩劍
+                                    var element = document.getElementById("HSourceBillNo");
+                                    element.focus();
+
+                                    childPage.getSelectedData(currRowIndex);
+
+                                    if (childData != null) {
+                                        obj.update({
+                                            "HMaterID": childData.HItemID,
+                                            "HMaterNumber": childData.鐗╂枡浠g爜,
+                                            "HMaterName": childData.鐗╂枡鍚嶇О,
+                                            "HMaterModel": childData.瑙勬牸鍨嬪彿,
+                                            "HUnitID": childData.HUnitID,
+                                            "HUnitNumber": childData.璁¢噺鍗曚綅浠g爜,
+                                            "HUnitName": childData.璁¢噺鍗曚綅鍚嶇О
+                                        });
+
+                                        if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉$爜') {
+                                            obj.update({
+                                                HQty: 1,    //鏁伴噺
+                                                HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
+                                                HBQty: 1    //绠辨暟
+                                            });
+                                        }
+
+                                        childData = null;
+                                    }
+                                    
+
+                                    childPage = null;
+                                    currRowIndex = 0;
+                                    childData = null;
+                                    obj.event = "";
+                                }
+                            }
+                        }
+                        else if (obj.event == "JMHSupNumber" || obj.event == "JMHSupName") {                           //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+                            if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                                if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                                    var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                                    var innerHeight = window.innerHeight;
+                                    var top = offset.top + 0.05 * innerHeight;
+                                    var left = offset.left;
+                                    if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                                        top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                                    }
+                                    layer.open({
+                                        type: 2                                                                                     //寮圭獥绫诲瀷
+                                        , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                                        , area: ['25%', '30%']                                                                      //澶у皬
+                                        , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                                        , offset: [top, left]
+                                        , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                                        //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                                        , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                                        , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                                        , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                                        , success: function (layero, index) {
+                                            setTimeout(function () {
+                                                var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                                currRowIndex = 0;
+                                                var tableView = "h_v_Gy_SupplierList_JM";
+                                                var childSWhere = "select HItemID,渚涘簲鍟嗕唬鐮�,渚涘簲鍟嗗悕绉� from " + tableView + " where 1=1 and (渚涘簲鍟嗕唬鐮� like '%" + value + "%' or 渚涘簲鍟嗗悕绉� like '%" + value + "%') order by 渚涘簲鍟嗕唬鐮� desc";
+                                                childPage.getData(childSWhere, tableView);
+                                            }, 200);
+                                        }
+                                        , end: function () {
+                                            obj.event = "";
+                                            childPage = null;
+                                            currRowIndex = 0;
+                                            if (childData != null) {
+                                                obj.update({
+                                                    "JMHSupID": childData.HItemID,
+                                                    "JMHSupNumber": childData.渚涘簲鍟嗕唬鐮�,
+                                                    "JMHSupName": childData.渚涘簲鍟嗗悕绉�,                                                    
+                                                });                                               
+                                                childData = null;
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    setTimeout(function () {
+                                        var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                        currRowIndex = 0;
+                                        var tableView = "h_v_Gy_SupplierList_JM";
+                                        var childSWhere = "select HItemID,渚涘簲鍟嗕唬鐮�,渚涘簲鍟嗗悕绉� from " + tableView + " where 1=1 and (渚涘簲鍟嗕唬鐮� like '%" + value + "%' or 渚涘簲鍟嗗悕绉� like '%" + value + "%') order by 渚涘簲鍟嗕唬鐮� desc";
+                                        childPage.getData(childSWhere, tableView);
+                                    }, 200);
+                                }
+                            } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                                if (event.key == "ArrowUp") {
+                                    currRowIndex--;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "ArrowDown") {
+                                    currRowIndex++;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "Enter") {
+                                    //鎵嬪姩澶辩劍
+                                    var element = document.getElementById("HSourceBillNo");
+                                    element.focus();
+
+                                    childPage.getSelectedData(currRowIndex);
+
+                                    if (childData != null) {
+                                        obj.update({
+                                            "JMHSupID": childData.HItemID,
+                                            "JMHSupNumber": childData.渚涘簲鍟嗕唬鐮�,
+                                            "JMHSupName": childData.渚涘簲鍟嗗悕绉�                                            
+                                        });                                        
+
+                                        childData = null;
+                                    }
+
+
+                                    childPage = null;
+                                    currRowIndex = 0;
+                                    childData = null;
+                                    obj.event = "";
+                                }
+                            }
+                        }
+
+                    }
+                    //#endregion
+
+                    if (event.key == "F7") {
+                        //鐗╂枡淇℃伅  濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪 鎸塅7
+                        if (obj.event === 'HMaterNumber')  //鐗╂枡淇℃伅  濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+                        {
+                            //鑾峰彇缁勭粐ID
+                            var HOrgID = $("#HOrgID").find("option:selected").val();
+                            //椤甸潰灞�-鑷畾涔�  //F7閫夋嫨妯″叿
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐗╂枡鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+                                    OptionData = checkStatus.data[0];
+                                    if (checkStatus.data.length >= 1) {
+                                        var rowIndex = $(obj.tr).attr("data-index") * 1;
+                                        for (var i = 0; i < checkStatus.data.length; i++) {
+                                            if (rowIndex + i >= option.data.length) {
+                                                var NewRow = {
+                                                    "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                                                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
+                                                };
+
+                                                table.cache["mainTable"].push(NewRow);
+                                                option.data = table.cache["mainTable"];
+
+                                                table.render(option);
+                                            }
+
+                                            var HMaterID = checkStatus.data[i].HItemID;
+                                            var resultData = getMaterialByMaterID(HMaterID);
+                                            option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+                                            option.data[rowIndex + i].HMaterNumber = resultData.HMaterNumber;
+                                            option.data[rowIndex + i].HMaterName = resultData.HMaterName;
+                                            option.data[rowIndex + i].HMaterModel = resultData.HMaterModel;
+                                            option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+                                            option.data[rowIndex + i].HUnitNumber = resultData.HUnitNumber;
+                                            option.data[rowIndex + i].HUnitName = resultData.HUnitName;
+
+                                            if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉$爜') {
+                                                option.data[rowIndex + i].HQty = 1;     //鏁伴噺
+                                                option.data[rowIndex + i].HMinQty = 1;  //鏈�灏忓寘瑁呮暟閲�
+                                                option.data[rowIndex + i].HBQty = 1;    //绠辨暟
+                                            }
+                                        }
+                                        table.render(option);
+                                    }
+                                    layer.closeAll();
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //杈呭姪灞炴�т俊鎭�
+                        if (obj.event === 'HAuxPropNumber')  //杈呭姪灞炴�т俊鎭�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '杈呭姪灞炴�у垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/PropertyInformation.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HAuxPropID: checkStatus.data[0].HItemID,
+                                        HAuxPropNumber: checkStatus.data[0].HNumber,
+                                        HAuxPropName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        //璁¢噺鍗曚綅浠g爜
+                        if (obj.event === 'HUnitNumber')  //璁¢噺鍗曚綅浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitNumber: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //瀹㈡埛浠g爜
+                        if (obj.event === 'HCusNumber')  //瀹㈡埛浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '瀹㈡埛鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/CustomerInformation.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HCusID: checkStatus.data[0].HItemID,
+                                        HCusNumber: checkStatus.data[0].HNumber,
+                                        HCusName: checkStatus.data[0].HName
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //瀹㈡埛浠g爜
+                        if (obj.event === 'HCusName')  //瀹㈡埛浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '瀹㈡埛鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/CustomerInformation.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HCusID: checkStatus.data[0].HItemID,
+                                        HCusNumber: checkStatus.data[0].HNumber,
+                                        HCusName: checkStatus.data[0].HName
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //鎿嶄綔鍛樹唬鐮�
+                        if (obj.event === 'HEmpNumber')  //鎿嶄綔鍛樹唬鐮�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鎿嶄綔鍛樺垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HEmpID: checkStatus.data[0].HItemID,
+                                        HEmpNumber: checkStatus.data[0].鑱屽憳浠g爜,
+                                        HEmpName: checkStatus.data[0].鑱屽憳鍚嶇О,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                    if (OptionData.length > 0) {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HEmpID": OptionData[0].HItemID
+                                            , "HEmpNumber": OptionData[0].鑱屽憳浠g爜
+                                            , "HEmpName": OptionData[0].鑱屽憳鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                }                               
+                            });
+                        }
+                        //鐝粍浠g爜
+                        if (obj.event === 'HGroupNumber')  //鐝粍浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐝粍鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HGroupID: checkStatus.data[0].HItemID,
+                                        HGroupNumber: checkStatus.data[0].鐝粍浠g爜,
+                                        HGroupName: checkStatus.data[0].鐝粍鍚嶇О,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //渚涘簲鍟嗕唬鐮�
+                        if (obj.event === 'HSupNumber')  //渚涘簲鍟嗕唬鐮�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HSupID: checkStatus.data[0].HItemID,
+                                        HSupNumber: checkStatus.data[0].渚涘簲鍟嗕唬鐮�,
+                                        HSupName: checkStatus.data[0].渚涘簲鍟嗗悕绉�
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //渚涘簲鍟嗗悕绉�
+                        if (obj.event === 'HSupName')  //渚涘簲鍟嗕唬鐮�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HSupID: checkStatus.data[0].HItemID,
+                                        HSupNumber: checkStatus.data[0].渚涘簲鍟嗕唬鐮�,
+                                        HSupName: checkStatus.data[0].渚涘簲鍟嗗悕绉�
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //渚涘簲鍟嗕唬鐮�
+                        if (obj.event === 'JMHSupNumber')  //渚涘簲鍟嗕唬鐮�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier2_JD.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        JMHSupID: checkStatus.data[0].HitemID,
+                                        JMHSupNumber: checkStatus.data[0].渚涘簲鍟嗕唬鐮�,
+                                        JMHSupName: checkStatus.data[0].渚涘簲鍟嗗悕绉�
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //渚涘簲鍟嗕唬鐮�
+                        if (obj.event === 'JMHSupName')  //渚涘簲鍟嗕唬鐮�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier2_JD.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , 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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        JMHSupID: checkStatus.data[0].HitemID,
+                                        JMHSupNumber: checkStatus.data[0].渚涘簲鍟嗕唬鐮�,
+                                        JMHSupName: checkStatus.data[0].渚涘簲鍟嗗悕绉�
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //?
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+            //#region 鏍规嵁鐗╂枡ID鑾峰彇鐗╂枡璇︾粏淇℃伅
+            function getMaterialByMaterID(HMaterID) {
+                var resultData = {};
+                $.ajax({
+                    url: GetWEBURL() + "Cg_ContractBill/getMaterialByMaterID",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "HMaterID": HMaterID
+                    },
+                    success: function (result) {
+                        if (result.code == 1) {
+                            var data = result.data;
+                            resultData = data[0];
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                return resultData;
+            }
+            //#endregion
+
+            //鏉$爜鐢熸垚
+            function SaveBarCodeCreate(sMainSub, CampanyName) {
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/Sc_BarCode/Sub_SaveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: false,
+                        data: { "msg": sMainSub, "CampanyName": CampanyName },
+                        dataType: "json",
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                table.reload('mainTable1', {
+                                    data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                });
+                                HBarInfo = result.list;
+                                //鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
+                                element.tabChange('tab-TabTest', '3');
+                                //鍔犺浇妗f鍒楄〃
+                                table.reload('mainTable2', {
+                                    data: result.data // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                });
+                                HFileList = result.data;
+                            }
+                            else {
+                                $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+                                layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]), { icon: 5 });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert(get_MessageError(err.Message, sessionStorage["HTranSlate"]), { icon: 5 });
+                        }
+                    });
+            }
+
+            //鏉$爜鎵撳嵃
+            function get_PrintReport() {
+                var checkStatus = table.checkStatus('mainTable2')
+                    , dataArr = checkStatus.data;
+
+                //鐢变簬鏉$爜淇℃伅鍒楄〃涓病鏈� HItemID 瀛楁锛屾墍浠ラ噰鍙栦簡鐢� 鏉$爜缂栧彿 鍘昏幏鍙� HItemID 鐨勬柟寮�
+                if (checkStatus.data.length > 0) {
+                    var rows = [];
+                    for (var i = 0; i < dataArr.length; i++) {
+                        rows.push(dataArr[i].HItemID.toString());
+                    }
+                    //rows = rows.substring(rows.length - 1, 0);
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HGy_BarCodeBill', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨瑕佹墦鍗扮殑鏉$爜鏁版嵁锛�', sessionStorage["HTranSlate"]));
+                }
+            }
+
+            //闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {
+                var Result = true;
+                if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+                    return Result = false;
+                }
+                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                    sSubStr = JSON.parse(sSubStr);
+                    for (var i = 0; i < sSubStr.length; i++) {
+                        //if (sSubStr[i].HMainID == "") {
+                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,婧愬崟淇℃伅涓虹┖!", { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return Result = false;
+                        //}
+                        if (sSubStr[i].HMaterID == "") {
+                            layer.msg(get_MessageError("[0000-2-056]鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HQty == "") {
+                            layer.msg(get_MessageError("[0000-2-057]鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓虹┖!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+                            return Result = false;
+                        }
+                    }
+                }
+                else {
+                    return Result = true;
+                }
+                return Result;
+            }
+
+            //鏍规嵁鍗曟嵁鍙疯幏鍙栨潯鐮佷俊鎭�
+            function getBarCodeByHBillNo(HBillNo,HSouceBillType) {
+                var ajaxLoad = layer.load();
+                HBillNo = decodeURIComponent(HBillNo);
+                let sWhere1 = "";
+                if (HBillNo.includes('@')) {
+                    str = HBillNo.split('@', 2);
+                    sWhere1 = " and HMainID in " + str[0] + " and HSubID in " + str[1];
+                } else {
+                    sWhere1 = " and 鍗曟嵁鍙� = '" + HBillNo + "'"
+                }
+                
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
+                    type: "GET",
+                    data: { "page": 1, "limit": 50, "sWhere": sWhere1, "HSouceBillType": HSouceBillType, "HOrgID": sessionStorage["OrganizationID"] },
+                    async: false,
+                    dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
+                    success: function (data1) {
+                        HBarInfo = ""; //瀛樺偍鏉$爜淇℃伅
+                        HFileList = "";  //瀛樺偍妗f鍒楄〃
+                        $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+                        element.tabChange('tab-TabTest', '1');
+                        var checkStatus = data1;//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data === null) {
+                            layer.close(ajaxLoad);
+                            /*return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鍗曟嵁鏁版嵁', sessionStorage["HTranSlate"]));*/
+                            return layer.msg("娌℃湁瀵瑰簲鍙敓鎴愬崟鎹�");
+                        }
+                        var list = [];
+                        var BillSelect = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i].閮ㄩ棬 != "" && checkStatus.data[i].閮ㄩ棬 != null) {
+                                list.push(checkStatus.data[i].閮ㄩ棬)
+                            }
+                            BillSelect.push({ BillType: checkStatus.data[i].HBillType, BillTitle: getSupType(), BillNo: checkStatus.data[i].鍗曟嵁鍙�, "BillMainID": checkStatus.data[i].HMainID, "BillSubID": checkStatus.data[i].HSubID, "SPID": 0, "BatchNo": "", "HAuxPropID": 0 });
+                        }
+                        if (isAllEqual(list))  //涓嶅厑璁搁�夋嫨涓嶅悓閮ㄩ棬
+                        {
+                            //鑾峰彇閫変腑鏁版嵁
+                            var GrdSelectData = JSON.stringify(BillSelect);
+                            //鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
+                            var HSourceBillType = $("#HSourceBillType").find("option:selected").html();
+                            //鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
+                            var HBarCodeType = $("#HBarCodeType").find("option:selected").html();
+                            //鑾峰彇褰撳墠鐧诲綍浜哄憳
+                            var UserName = sessionStorage["HUserName"];
+                            var Str = GrdSelectData + ";" + HSourceBillType + ";" + HBarCodeType + ";" + UserName;
+                            //閫氳繃閫夋嫨鐨勬簮鍗曚富瀛愬唴鐮佹煡鎵捐缁嗕俊鎭�
+                            $.ajax({
+                                type: "post",
+                                url: GetWEBURL() + "/Sc_BarCode/SelectReportFromBillList",
+                                //contentType: 'application/json',
+                                async: false,
+                                dataType: "json",
+                                data: { "msg": Str },
+                                //traditional: true,
+                                success: function (result) {
+                                    HMaterID = result.list[0].HMaterID;
+                                    HBatchNo = result.list[0].HBatchNo;
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        for (let i = 0; i < result.list.length; i++) {
+                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0]  //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟
+                                            if (result.list[i].HMinQty != 0) {
+                                                result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
+                                            }
+                                            result.list[i].HEmpID = sessionStorage["HEmpID"]
+                                            result.list[i].HEmpNumber = sessionStorage["HEmpNumber"]
+                                            result.list[i].HEmpName = sessionStorage["HEmpName"]
+                                        }
+
+                                        BatchNoArray = result.list;  //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
+                                        //for (let i = 0; i < result.list.length; i++) {
+                                        //    result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
+                                        //}
+                                        console.log(result.list[0]);
+                                        table.reload('mainTable', {
+                                            data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                        });
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(ajaxLoad);
+                                    }
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(get_MessageError("[3899-2-001]涓嶅厑璁搁�夋嫨涓嶅悓鐨勯儴闂ㄦ暟鎹�!", sessionStorage["HTranSlate"]), { time: 1 * 2000, icon: 5 });
+                        }
+                    }, error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                        layer.close(ajaxLoad);
+                    }
+                });
+            }
+
+            //鐧诲綍鏍规嵁ic鍗″彿
+            function loginByICCard(HBarCode) {
+                var index = layer.load();
+                //鑾峰彇榛樿缁勭粐鍚嶇О
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (let element of data) {
+                                if (element.ID == HOrgID) {
+                                    sessionStorage["Organization"] = element.Name;
+                                }
+                            }
+                        }
+                    },
+                    error: function (err) {
+                        login_result = false;
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                })
+                //鑾峰彇鐧诲綍淇℃伅
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetUserByICCard",
+                    type: "GET",
+                    async: false,
+                    data: { "HBarCode": HBarCode },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.close(index);
+                            sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//閲戣澏浜戣处鍙�
+                            sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
+                            sessionStorage["HMaker"] = result.data[0].Czymc;
+                            sessionStorage["HUserName"] = result.data[0].Czymc;
+                            sessionStorage["HBillerID"] = result.data[0].HK3UserID;
+                            sessionStorage["SourceFlag"] = false;
+                            sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
+                            sessionStorage["HKeeper"] = result.data[0].HKeeper;
+                            sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
+                            sessionStorage["HSecManager"] = result.data[0].HSecManager;
+                            sessionStorage["HSellManID"] = result.data[0].HSellManID;
+                            sessionStorage["HSellMan"] = result.data[0].HSellMan;
+                            sessionStorage["HDeptID"] = result.data[0].HDeptID;
+                            sessionStorage["HDept"] = result.data[0].HDept;
+                            sessionStorage["HWHID"] = result.data[0].HWhID;
+                            sessionStorage["HWHName"] = result.data[0].HWHName;
+                            sessionStorage["HSPID"] = result.data[0].HSPID;
+                            sessionStorage["HSPName"] = result.data[0].HSPName;
+                            sessionStorage["HSupID"] = result.data[0].HSupID;
+                            sessionStorage["HSupName"] = result.data[0].HSupName;
+                            sessionStorage["Czmm"] = result.data[0].Czmm;
+                            sessionStorage["Czybm"] = result.data[0].Czybm;
+                            sessionStorage["HEmpID"] = result.data[0].HEmpID;
+                            sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
+                            sessionStorage["HEmpName"] = result.data[0].HEmpName;
+                            sessionStorage["HGroup"] = result.data[0].HGroup;
+                            sessionStorage["HGroupID"] = result.data[0].HGroupID;
+                            sessionStorage["HProc"] = result.data[0].HProc;
+                            sessionStorage["HProcNo"] = result.data[0].HProcNo;
+                            sessionStorage["HSource"] = result.data[0].HSource;
+                            sessionStorage["HSourceID"] = result.data[0].HSourceID;
+                            sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+                            sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+                            sessionStorage["HProcName"] = result.data[0].HProcName;
+                            sessionStorage["HProcID"] = result.data[0].HProcID;
+                            sessionStorage["HCheckEmpID"] = result.data[0].HCheckEmpID;
+                            sessionStorage["HCheckEmpName"] = result.data[0].HCheckEmpName;
+                            sessionStorage["login"] = "login";
+                            sessionStorage["OrganizationID"] = HOrgID;
+                            //sessionStorage["Organization"] = $("#Organization option:selected").text();
+                            sessionStorage["HTranSlate"] = HTranSlate;    
+                        }
+                        else {
+                            layer.close(index);
+                            login_result = false;
+                            layer.msg("鍑虹幇闂锛�" + result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        login_result = false;
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#endregion
+
+
+        });
+
+        //鎿嶄綔鍛�
+        function GetHEmpValue(obj) {
+            OptionData = obj;
+        }
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
index 2ae2a07..5f0abb2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
@@ -416,7 +416,7 @@
 
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                 if (dataCol[i]) {
                                     var dataCols = dataCol[i].split('|');
                                 }
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_ConkType.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_ConkType.html"
index 6a40d63..8ff36c5 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_ConkType.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_ConkType.html"
@@ -76,18 +76,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -110,18 +106,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -144,18 +136,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
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_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/Gy_Material.html"
index 7c40f4e..e661863 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_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/Gy_Material.html"
@@ -553,15 +553,6 @@
             })
             //#endregion
 
-            //#region 鍙屽嚮杩斿洖鏁版嵁
-            //table.on('rowDouble(mainTable)', function (obj) {
-            //  var data = [];
-            //   data.push(obj.data);
-            //  parent.GetMaterValue(data);
-            //  var index = parent.layer.getFrameIndex(window.name);
-            //   parent.layer.close(index);
-            //   });
-            //#endregion
 
             //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
 
@@ -593,20 +584,20 @@
                     , page: false
                     , limit: 50
                     , done: function (res, curr, count) {
-                        var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
-                        var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
-                        var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
-                        for (var i = 0; i < $data.length; i++) {
-                            var l1 = $data.eq(i).find('div').width();
-                            var l2 = $head.eq(i).find('div').width();
-                            if (l1 > l2) {
-                                $head.eq(i).find('div').width(l1);
-                                $total.eq(i).find('div').width(l1);
-                            } else {
-                                $data.eq(i).find('div').width(l2);
-                                $total.eq(i).find('div').width(l2);
-                            }
-                        }
+                        //var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
+                        //var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
+                        //var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
+                        //for (var i = 0; i < $data.length; i++) {
+                        //    var l1 = $data.eq(i).find('div').width();
+                        //    var l2 = $head.eq(i).find('div').width();
+                        //    if (l1 > l2) {
+                        //        $head.eq(i).find('div').width(l1);
+                        //        $total.eq(i).find('div').width(l1);
+                        //    } else {
+                        //        $data.eq(i).find('div').width(l2);
+                        //        $total.eq(i).find('div').width(l2);
+                        //    }
+                        //}
                     }
                 };
                 optionPage = {
@@ -773,6 +764,11 @@
                                         }, style: 'cursor: pointer;'
                                     });
                                 }
+                                else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 300
+                                    });
+                                }
                                 else {
                                     switch (data[i].Type) {
                                         //int
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index 7801f74..3ff2cb2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -399,6 +399,9 @@
             case "HGy_BarCodeBill_xiaowei": //zutuoxiaowei鏄庣粏
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill_ZB.aspx?linterid=" + value, true, "");
                 break;
+            case "HGy_BarCodeBill_ZB": //灏忓崼鏍堟澘鐮佹槑缁�
+                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill_ZB.aspx?linterid=" + value, true, "");
+                break;
         }
     </script>
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier2_JD.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier2_JD.html"
new file mode 100644
index 0000000..c99de09
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier2_JD.html"
@@ -0,0 +1,516 @@
+锘�
+<!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 http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <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/HideButton_New.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/layui/layui1.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">渚涘簲鍟嗕唬鐮�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                    </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 ForFilteringSchemes" 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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>                             
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
+            var sWhere = "select * from h_v_Gy_SupplierList_JM where 1=1  ";
+            var HProcName = "";
+            var option = [];
+            var HModName = "Gy_Supplier2_JD";
+            var HBillType = "Gy_Supplier2_JD";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "榛樿宸ュ簭", "HUSEORGID", "HCREATEORGID"];
+            //#endregion
+
+        
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            var params = getUrlVars();
+            var Type = params[params[0]];
+            HProcName = params[params[1]] == undefined? "": params[params[1]];
+            HProcName = decodeURI(HProcName);
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鍒锋柊鎸夐挳
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;                  
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //浠g爜鍥炶溅鏂规硶
+            $('#HNumber').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });          
+
+            //鍚嶇О鍥炶溅鏂规硶
+            $('#HName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {              
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_FastQuery();               
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 20000]
+                    , limit: 50
+                    , cellMinWidth: 90                
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Supplier/JD_GysupperList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�                   
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }                                
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 20000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                           
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                layer.close(index);
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();                             
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+               
+                if (HNumber) {
+                    sWhere += " and 渚涘簲鍟嗕唬鐮� like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + HName + "%'";
+                }                  
+
+                sWhere += " order by 渚涘簲鍟嗕唬鐮�";
+                get_Display(sWhere);
+                sWhere = " select * from h_v_Gy_SupplierList_JM where 1=1   ";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HProcName").val("");
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = " select * from h_v_Gy_SupplierList_JM where 1=1   ";
+                $("#btnSearch").click();
+            }
+
+
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var sWhere = "";
+                var params = get_UrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                if (typeof (openType) != "undefined") {
+                    sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''"
+                    return sWhere;
+                }
+                return sWhere;
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_FastQuery(1);
+            }
+            //#endregion
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+        
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillList.html"
index 299672c..238b009 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillList.html"
@@ -96,18 +96,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -130,18 +126,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
-                                                class="ForFilteringSchemes" style="width:190px;">
+                                                    class="ForFilteringSchemes" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -164,18 +156,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
-                                                class="ForFilteringSchemes" style="width:190px;">
+                                                    class="ForFilteringSchemes" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
index 0fc082e..47fa9c5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
@@ -101,13 +101,9 @@
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -130,18 +126,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
-                                                class="ForFilteringSchemes" style="width:190px;">
+                                                    class="ForFilteringSchemes" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -164,18 +156,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
-                                                class="ForFilteringSchemes" style="width:190px;">
+                                                    class="ForFilteringSchemes" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldConkBookBillMainReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldConkBookBillMainReport.html"
index fe1d5c6..6b21115 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldConkBookBillMainReport.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldConkBookBillMainReport.html"
@@ -496,19 +496,12 @@
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
+              
                 set_Graphics();
             }
 
             //鍒濆鍖栬〃鏍�
-            function set_InitGrid() {
-                //option = {
-                //    elem: '#mainTable'
-                //    , toolbar: '#toolbarDemo'
-                //    , cellMinWidth: 120
-                //    , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
-                //    , height: 'full-70'
-                //};
+            function set_InitGrid() {                
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
@@ -554,7 +547,7 @@
                             }
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
                             //鍒ゆ柇鏄惁鏄函鑻辨枃
-                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            var patrn = new RegExp("[\u4E00-\u9FA50-9]+");
                             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 }); //闅愯棌鍒�
@@ -569,7 +562,7 @@
                                         case 'Int64':
                                         case 'double':
                                         case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                             break;  
                                         default:
                                             col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldMaintainBillMainReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldMaintainBillMainReport.html"
index 11d0b3b..fad24d1 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldMaintainBillMainReport.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldMaintainBillMainReport.html"
@@ -496,19 +496,12 @@
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
+                
                 set_Graphics();
             }
 
             //鍒濆鍖栬〃鏍�
-            function set_InitGrid() {
-                //option = {
-                //    elem: '#mainTable'
-                //    , toolbar: '#toolbarDemo'
-                //    , cellMinWidth: 120
-                //    , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
-                //    , height: 'full-70'
-                //};
+            function set_InitGrid() {              
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
@@ -554,7 +547,7 @@
                             }
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
                             //鍒ゆ柇鏄惁鏄函鑻辨枃
-                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            var patrn = new RegExp("[\u4E00-\u9FA50-9]+");
                             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 }); //闅愯棌鍒�
@@ -569,7 +562,7 @@
                                         case 'Int64':
                                         case 'double':
                                         case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                             break;  
                                         default:
                                             col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairWorkBillReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairWorkBillReport.html"
index 04f1855..0b91a70 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairWorkBillReport.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairWorkBillReport.html"
@@ -496,19 +496,11 @@
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
                 set_Graphics();
             }
 
             //鍒濆鍖栬〃鏍�
-            function set_InitGrid() {
-                //option = {
-                //    elem: '#mainTable'
-                //    , toolbar: '#toolbarDemo'
-                //    , cellMinWidth: 120
-                //    , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
-                //    , height: 'full-70'
-                //};
+            function set_InitGrid() {               
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
@@ -554,7 +546,7 @@
                             }
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
                             //鍒ゆ柇鏄惁鏄函鑻辨枃
-                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            var patrn = new RegExp("[\u4E00-\u9FA50-9]+");
                             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 }); //闅愯棌鍒�
@@ -569,7 +561,7 @@
                                         case 'Int64':
                                         case 'double':
                                         case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                             break;  
                                         default:
                                             col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillList.html"
index 03b8184..c000184 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillList.html"
@@ -106,18 +106,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <= </option>
-                                                <option value="<">
-                                                    < </option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -140,18 +136,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <= </option>
-                                                <option value="<">
-                                                    < </option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -174,18 +166,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <= </option>
-                                                <option value="<">
-                                                    < </option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -252,7 +240,7 @@
             var sWhere = "";
             var option = [];
             var HModName = "Sc_MouldDotCheckRuleBillList";
-            var titleData = ["hmainid", "鐐规椤圭洰ID", "璐熻矗浜篒D", "hbilltype", "HMoudType", "hsubid", "鍐呴儴鍗曟嵁鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hmainid", "鐐规椤圭洰ID", "璐熻矗浜篒D", "hbilltype","HMouldID", "HMoudType", "hsubid", "鍐呴儴鍗曟嵁鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var ins; //鐢ㄤ簬瀵煎嚭excel
             var HBillType = "3834";
             var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
index dc7ab3b..f1c93b5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
@@ -6,7 +6,6 @@
     <title>鍣ㄥ叿缁翠慨娲惧伐鍗曞垪琛�</title>
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -90,18 +89,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -124,18 +119,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -158,18 +149,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
index 44a05e3..de27892 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
@@ -1704,7 +1704,7 @@
                     searchKey: '妯″叿鍚嶇О,妯″叿缂栧彿',
                     sWhere: " ",//table鎼滅储sWhere鏉′欢
                     ajaxSelect: function (sWhere) {
-                        var data = '';
+                        var data = [];
                         var ModRightNameSelect = 'Gy_MouldFileList';
                         $.ajax({
                             url: GetWEBURL() + '/Gy_Mould/page',
@@ -1743,30 +1743,30 @@
                     },
                     done: function (elem, data) {
                         $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
-                        if (typeof (OptionData) != "undefined" && OptionData != []) {
-                            obj.update({
-                                "HMaterID": OptionData["hmainid"]
-                                , "HMaterCode": data.data[0]["妯″叿缂栧彿"]
-                                , "HMaterName": data.data[0]["妯″叿鍚嶇О"]
+                        
+                        obj.update({
+                            "HMaterID": data.data[0]["hmainid"]
+                            , "HMaterCode": data.data[0]["妯″叿缂栧彿"]
+                            , "HMaterName": data.data[0]["妯″叿鍚嶇О"]
 
-                                , "HMaterModel": data.data[0]["妯″叿鍨嬪彿"]
-                                , "HUnitID": data.data[0]["HUnitID"]
-                                , "HUnitNumber": data.data[0]["璁¢噺鍗曚綅浠g爜"]
-                                , "HUnitName": data.data[0]["璁¢噺鍗曚綅"]
-                                , "HWHID": data.data[0]["HWHID"]
-                                , "HWHName": data.data[0]["榛樿浠撳簱"]
-                                , "HWHNumber": data.data[0]["榛樿浠撳簱浠g爜"]
-                                , "HSPID": data.data[0]["HSPID"]
-                                , "HSPName": data.data[0]["榛樿浠撲綅"]
-                                , "HSPNumber": data.data[0]["妯″叿鍚嶇О"]
-                                , "HDesignLife": 0
-                                , "HLeaveLife": 0
-                                , "HQty": 1
-                                , "HMoney": 0
-                            })
+                            , "HMaterModel": data.data[0]["妯″叿鍨嬪彿"]
+                            , "HUnitID": data.data[0]["HUnitID"]
+                            , "HUnitNumber": data.data[0]["璁¢噺鍗曚綅浠g爜"]
+                            , "HUnitName": data.data[0]["璁¢噺鍗曚綅"]
+                            , "HWHID": data.data[0]["HWhID"]
+                            , "HWHName": data.data[0]["榛樿浠撳簱"]
+                            , "HWHNumber": data.data[0]["榛樿浠撳簱浠g爜"]
+                            , "HSPID": data.data[0]["HSPID"]
+                            , "HSPName": data.data[0]["榛樿浠撲綅"]
+                            , "HSPNumber": data.data[0]["榛樿浠撲綅浠g爜"]
+                            , "HDesignLife": 0
+                            , "HLeaveLife": 0
+                            , "HQty": 1
+                            , "HMoney": 0
+                        })
 
                             table.render(option);
-                        }
+                        
                         
 
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index 8b7307f..5c709e0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -449,7 +449,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 console.log(NewRow);
                 switch (obj.event) {
                     //鏂板涓�琛�
@@ -1036,7 +1036,7 @@
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
                 $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true);
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -1060,7 +1060,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -1255,7 +1255,7 @@
                                         var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
                                         for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
                                             if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
-                                                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                                                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                                                 table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
                                                 option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
                                                 table.render(option);//娓叉煋鐣岄潰
@@ -1267,7 +1267,7 @@
                                             option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
                                             option.data[rowIndex + i].HUnitCode = checkStatus.data[i].璁¢噺鍗曚綅浠g爜;
                                             option.data[rowIndex + i].HUnitName = checkStatus.data[i].璁¢噺鍗曚綅;
-                                            option.data[rowIndex + i].HWHID = checkStatus.data[i].HWHID;
+                                            option.data[rowIndex + i].HWHID = checkStatus.data[i].HWhID;
                                             option.data[rowIndex + i].HWHName = checkStatus.data[i].榛樿浠撳簱;
                                             option.data[rowIndex + i].HWHCode = checkStatus.data[i].榛樿浠撳簱浠g爜;
                                             option.data[rowIndex + i].HSPID = checkStatus.data[i].HSPID;
@@ -1527,7 +1527,7 @@
                     sWhere: " ",//table鎼滅储sWhere鏉′欢
                     ajaxSelect: function (sWhere) {
                         console.log("sWhere", sWhere)
-                        var data = '';
+                        var data = [];
                         var ModRightNameSelect = 'Gy_MouldFileList';
                         $.ajax({
                             url: GetWEBURL() + '/Gy_Mould/page',
@@ -1575,12 +1575,12 @@
                             , "HUnitID": data.data[0]["HUnitID"]
                             , "HUnitCode": data.data[0]["璁¢噺鍗曚綅浠g爜"]
                             , "HUnitName": data.data[0]["璁¢噺鍗曚綅"]
-                            , "HWHID": data.data[0]["HWHID"]
+                            , "HWHID": data.data[0]["HWhID"]
                             , "HWHName": data.data[0]["榛樿浠撳簱"]
                             , "HWHCode": data.data[0]["榛樿浠撳簱浠g爜"]
                             , "HSPID": data.data[0]["HSPID"]
                             , "HSPName": data.data[0]["榛樿浠撲綅"]
-                            , "HSPCode": data.data[0]["妯″叿鍚嶇О"]
+                            , "HSPCode": data.data[0]["榛樿浠撲綅浠g爜"]
 
                             , "HDesignLife": 0
                             , "HLeaveLife": 0
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 9e4a31c..edb3b74 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -1705,7 +1705,7 @@
                     searchKey: '妯″叿鍚嶇О,妯″叿缂栧彿',
                     sWhere: " ",//table鎼滅储sWhere鏉′欢
                     ajaxSelect: function (sWhere) {
-                        var data = '';
+                        var data = [];
                         var ModRightNameSelect = 'Gy_MouldFileList';
                         $.ajax({
                             url: GetWEBURL() + '/Gy_Mould/page',
@@ -1753,12 +1753,12 @@
                             , "HUnitID": data.data[0]["HUnitID"]
                             , "HUnitNumber": data.data[0]["璁¢噺鍗曚綅浠g爜"]
                             , "HUnitName": data.data[0]["璁¢噺鍗曚綅"]
-                            , "HWHID": data.data[0]["HWHID"]
-                            , "HWHName": data.data[0]["榛樿浠撳簱"]
-                            , "HWHNumber": data.data[0]["榛樿浠撳簱浠g爜"]
-                            , "HSPID": data.data[0]["HSPID"]
-                            , "HSPName": data.data[0]["榛樿浠撲綅"]
-                            , "HSPNumber": data.data[0]["榛樿浠撲綅浠g爜"]
+                            , "HWHID": data.data[0]["褰撳墠浠撳簱ID"]
+                            , "HWHName": data.data[0]["褰撳墠浠撳簱"]
+                            , "HWHNumber": data.data[0]["褰撳墠浠撳簱浠g爜"]
+                            , "HSPID": data.data[0]["褰撳墠浠撲綅ID"]
+                            , "HSPName": data.data[0]["褰撳墠浠撲綅"]
+                            , "HSPNumber": data.data[0]["褰撳墠浠撲綅浠g爜"]
                             , "HDesignLife": 0
                             , "HLeaveLife": 0
                             , "HQty": 1
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index 6943659..a1e97ca 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -809,7 +809,7 @@
                     searchKey: '妯″叿鍚嶇О,妯″叿缂栧彿',
                     sWhere: " ",//table鎼滅储sWhere鏉′欢
                     ajaxSelect: function (sWhere) {
-                        var data = '';
+                        var data = [];
                         var ModRightNameSelect = 'Gy_MouldFileList';
                         $.ajax({
                             url: GetWEBURL() + '/Gy_Mould/page',
@@ -857,12 +857,12 @@
                             , "HUnitID": data.data[0]["HUnitID"]
                             , "HUnitCode": data.data[0]["璁¢噺鍗曚綅浠g爜"]
                             , "HUnitName": data.data[0]["璁¢噺鍗曚綅"]
-                            , "HWHID": data.data[0]["HWHID"]
-                            , "HWHName": data.data[0]["榛樿浠撳簱"]
-                            , "HWHCode": data.data[0]["榛樿浠撳簱浠g爜"]
-                            , "HSPID": data.data[0]["HSPID"]
-                            , "HSPName": data.data[0]["榛樿浠撲綅"]
-                            , "HSPCode": data.data[0]["妯″叿鍚嶇О"]
+                            , "HWHID": data.data[0]["褰撳墠浠撳簱ID"]
+                            , "HWHName": data.data[0]["褰撳墠浠撳簱"]
+                            , "HWHCode": data.data[0]["褰撳墠浠撳簱浠g爜"]
+                            , "HSPID": data.data[0]["褰撳墠浠撲綅ID"]
+                            , "HSPName": data.data[0]["褰撳墠浠撲綅"]
+                            , "HSPCode": data.data[0]["褰撳墠浠撲綅浠g爜"]
                             , "HDesignLife": 0
                             , "HLeaveLife": 0
                             , "HQty": 1
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 01f1d98..d62e0dc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -870,7 +870,68 @@
                 });
             }
             //#endregion
+            
+            //#region  鏍堟澘鐮佹墦鍗�
+            function PrintZB() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                var ModRightName = 'Gy_BarCodeBillList_Print';
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillPermission',
+                    type: "GET",
+                    async: false,
+                    data: { "user": sessionStorage["HUserName"] },
+                    success: function (res) {
+                        if (res.data == 1) {
+                            if (checkStatus.data.length == 1) {
+                                var rows = '';
+                                for (var i = 0; i < data.length; i++) {
+                                    rows += data[i].涓鐮�.toString() + ',';
+                                }
+                                rows = rows.substring(rows.length - 1, 0);
 
+                                var sql = "select top 1 HBarCode_Pack from Sc_PackUnionBillsub with(nolock) where HBarCode = '" + rows + "'"
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    async: false,
+                                    data: { "sWhere": sql },
+                                    success: function (data) {
+                                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            rows = data.data[0].rows;
+                                        }
+                                        else {
+                                            layer.msg(data.Message, { icon: 5 });
+                                        }
+                                        layer.closeAll("loading");
+                                    },
+                                    error: function (err) {
+                                        layer.msg("閿欒:" + err, { icon: 5 });
+                                    }
+                                })
+
+                                layer.open({
+                                    type: 2
+                                    , area: ['40%', '80%']
+                                    , title: '鎵撳嵃妯$増閫夋嫨'
+                                    , shade: 0.6 //閬僵閫忔槑搴�
+                                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_ZB', 'yes']
+                                    , resize: false
+                                })
+                            }
+                            else {
+                                layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨涓�鏉℃暟鎹墦鍗帮紒', sessionStorage["HTranSlate"]));
+                            }
+                        }
+                        else {
+                            layer.alert(get_MessageError("鏃犳墦鍗版潈闄�!", sessionStorage["HTranSlate"]), { icon: 5 });
+                        }
+                    }
+                });
+            }
+            //#endregion
 
             //#region  鍑虹珯鍗曠敓鎴愮殑绠辩爜鎵撳嵃
             function PrintX() {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 80bb837..84ebe80 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -239,6 +239,7 @@
                                                 <option value="閿佸畾">閿佸畾</option>
                                                 <option value="棰嗗嚭">棰嗗嚭</option>
                                                 <option value="鎶ュ簾">鎶ュ簾</option>
+                                                <option value="鏁呴殰">鏁呴殰</option>
                                                 <option value="鏈惎鐢�">鏈惎鐢�</option>
                                                 <option value="浣滃簾">浣滃簾</option>
                                             </select>
@@ -2878,7 +2879,7 @@
             }
            
             //鍑礉娴疯瘹浠ヤ笅瀛楁涓嶆牎楠�
-            if ((sessionStorage["OrganizationID"] != "100007" && sessionStorage["OrganizationID"] != "100038") && sessionStorage["OrganizationID"] !="100071") {
+            if ((sessionStorage["OrganizationID"] != "100007" && sessionStorage["OrganizationID"] != "100038") && sessionStorage["OrganizationID"] != "100071" && sessionStorage["OrganizationID"] != "1") {
                 if ($("#HModel").val() == '' || $("#HModel").val() == null) {
                     layer.msg("鍣ㄥ叿瑙勬牸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return Result = false;
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/Sb_MouldRepairWorkBillList.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/Sb_MouldRepairWorkBillList.html"
index c9053a9..abaf79f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.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/Sb_MouldRepairWorkBillList.html"
@@ -121,18 +121,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -155,18 +151,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -189,18 +181,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
index 10643f3..af3bfa8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
@@ -112,18 +112,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -146,18 +142,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -180,18 +172,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
index 3371e56..49d5a47 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
@@ -102,18 +102,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -136,18 +132,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -170,18 +162,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -252,7 +240,7 @@
             var option2 = [];
             var HModName = "Sc_MouldDotCheckBillList";
             var HBillType = "3821";
-            var titleData = ["hmainid", "HPlanInterID", "HDotCheckItemID", "鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HBillType", "HMouldDotCheckRuleID", "HShiftsID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hmainid", "HPlanInterID", "HDotCheckItemID", "鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HBillType", "HMouldDotCheckRuleID", "HShiftsID", "鐐规璁″垝鍐呯爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
             var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
index 98a949f..6eb91a1 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
@@ -94,18 +94,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -128,18 +124,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -162,18 +154,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -277,7 +265,7 @@
             var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             var ins;
 
-            var titleData = ["hmainid", "鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HMouldID", "HEmpID", "HBillType", "婧愬崟涓诲唴鐮�", "sorderid", "淇濆吇璁″垝鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿","婧愬崟绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hmainid", "鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HMouldID", "HEmpID", "HBillType", "婧愬崟涓诲唴鐮�", "sorderid", "淇濆吇璁″垝鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷","淇濆吇璁″垝鍐呯爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
index 94d5d80..463a49a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
@@ -86,18 +86,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -120,18 +116,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -154,18 +146,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -197,8 +185,7 @@
                             </div>
                         </div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">                              
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
index 8086b8f..808dd1b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
@@ -87,14 +87,7 @@
                                     <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
                                          id="HFilterScheme_Now"></div>
                                 </div>
-                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
-                                    <!--<div class="layui-inline">
-                                        <label class="layui-form-label">鍒跺崟浜�</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy"
-                                                   id="HCreateBy">
-                                        </div>
-                                    </div>-->
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">  
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
@@ -111,13 +104,9 @@
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -145,13 +134,9 @@
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -179,13 +164,9 @@
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
index daf6a0b..9ffcbc1 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
@@ -105,18 +105,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -139,18 +135,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -173,18 +165,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -203,7 +191,6 @@
                         <div id="page" style="position: relative; bottom: 0;"></div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container"  id="toolbarDemo_ButtonSet">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -212,10 +199,6 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-details" id="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-exit" id="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
index 921b395..597a18a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
@@ -257,7 +257,7 @@
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion 
-            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID","鍗曟嵁绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //杩囨护鏉′欢鐨刢lass绫�
@@ -541,9 +541,14 @@
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
                             var totalArray = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -690,7 +695,7 @@
 
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                 var dataCols = dataCol[i].split('|');
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
index b699816..cc51b9a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
@@ -512,7 +512,7 @@
 
             //閫�鍑�
             function get_Exit() {
-                if (OperationType != 3 || OperationType != 1) {
+                if (OperationType != 1 &&  OperationType!= 3) {
                     Pub_Close(2);
                 } else {
                     Pub_Close(1);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 93942d6..b663682 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -283,6 +283,10 @@
                                                         <option value="鍗犵敤">鍗犵敤</option>
                                                         <option value="鍔犲伐">鍔犲伐</option>
                                                         <option value="鍏虫満">鍏虫満</option>
+                                                        <option value="寮�鏈�">寮�鏈�</option>
+                                                        <option value="鐢熶骇">鐢熶骇</option>
+                                                        <option value="寰呮満">寰呮満</option>
+                                                        <option value="鍋滄満">鍋滄満</option>
                                                         <option value="寮傚父鍋滄満">寮傚父鍋滄満</option>
                                                     </select>
                                                 </div>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
index 21723b2..5c34623 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
@@ -155,6 +155,7 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -197,6 +198,7 @@
             var size = 50;
             var sWhere = "";
             var HModName = "QC_OutCompCheckBillList";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -220,6 +222,9 @@
             //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鏂板鎸夐挳
                     case 'set_AddNew': set_AddNew();
                         break;
@@ -475,6 +480,7 @@
                             option.totalRow = true;
                             table.render(option);
                             laypage.render(optionPage);
+                            ins = table.render(option);
 
                             DisPlay_HideColumn();
                             
@@ -817,7 +823,25 @@
             }
             //#endregion
 
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                option.data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                        if (itemobj === '瑙勬牸鍨嬪彿') {
+                            item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                        }
+                    }
+                });
 
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
 
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
index a224684..d543814 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
@@ -68,7 +68,7 @@
                                                         </button>
                                                     </div>
                                                 </div>
-                                                <div class="layui-inline" style="display:none;">
+                                                <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="HSource" name="HSource" id="HSource" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -125,6 +125,12 @@
                                                     <label class="layui-form-label" style="margin-left:5px;">浠诲姟鍗曟暟閲�</label>
                                                     <div class="layui-input-inline">
                                                         <input type="text" name="HICMOQty" id="HICMOQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" style="background-color: #efefef4d;" value="0" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:5px;">浜ч噺</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HPrdQty" id="HPrdQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" style="" value="0" onfocus="this.select();">
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
@@ -1406,10 +1412,11 @@
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
                                 , "HDate": formatDate(data.鏃ユ湡)
-                                //, "HSource": data.鐢熶骇璧勬簮鍚嶇О
-                                //, "HSourceID": data.鐢熶骇璧勬簮ID
+                                , "HSource": data.鐢熶骇璧勬簮鍚嶇О
+                                , "HSourceID": data.鐢熶骇璧勬簮ID
                                 , "HICMOBillNo": data.鐢熸垚璁㈠崟鍙�
                                 , "HICMOQty": data.鐢熶骇璁㈠崟鏁伴噺
+                                , "HPrdQty": data.浜ч噺
                                 , "HICMOInterID": data.鐢熶骇璁㈠崟涓诲唴鐮�
                                 , "HICMOEntryID": data.鐢熶骇璁㈠崟瀛愬唴鐮�
                                 , "HMaterName": data.浜у搧鍚嶇О
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index f340ab7..7fe68c5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -157,6 +157,7 @@
                             <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" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                     <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
                                     <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                     <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
@@ -250,7 +251,7 @@
             //鍏敤鍙橀噺
             var option = [];
             var HModName = "QC_PatrolProcCheckBillList";
-
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "7506";
@@ -351,6 +352,9 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     case 'btn-Add':
                         set_AddNew();
                         break;
@@ -481,23 +485,24 @@
                     success: function (result) {
                         if (result.count == 1) {
                             ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                            table.reload('mainTable', {
-                                data: ajaxReturnData
-                                , height: 'full-10'
-                                , page: {
-                                    curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
-                                }
-                                , loading: false
-                                , done: function (index, res) {
-                                    soulTable.render(this);
-                                }
-                            });
+                            //table.reload('mainTable', {
+                            //    data: ajaxReturnData
+                            //    , height: 'full-10'
+                            //    , page: {
+                            //        curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
+                            //    }
+                            //    , loading: false
+                            //    , done: function (index, res) {
+                            //        soulTable.render(this);
+                            //    }
+                            //});
+                            option.data = ajaxReturnData
+                            ins = table.render(option);
                             layer.close(ajaxLoad);
                             //杩囨护
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                 ColFilter();
                             }
-
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             var HBillType = "7506";
@@ -809,6 +814,26 @@
                 });
             }
 
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                option.data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                        if (itemobj === '瑙勬牸鍨嬪彿') {
+                            item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                        }
+                    }
+                });
+
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
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/QC_POStockInCheckBillList.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/QC_POStockInCheckBillList.html"
index ba41881..b7a4c1c 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/QC_POStockInCheckBillList.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/QC_POStockInCheckBillList.html"
@@ -177,13 +177,14 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_PrintReport"><i class="layui-icon layui-icon-print"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
@@ -217,6 +218,7 @@
             var option = [];
             var sWhere = "";
             var HModName = "QC_POStockInCheckBillList";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
 
@@ -242,6 +244,9 @@
             //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鏂板鎸夐挳
                     case 'set_AddNew': set_AddNew();
                         break;
@@ -454,6 +459,7 @@
                             DisPlay_HideColumn();
                             option.data = data1.data;
                             table.render(option);
+                            ins = table.render(option);
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
@@ -733,6 +739,26 @@
             }
             //#endregion
 
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                option.data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                        if (itemobj === '瑙勬牸鍨嬪彿') {
+                            item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                        }
+                    }
+                });
+
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList_ICMO.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList_ICMO.html"
index 17c3719..8813a94 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList_ICMO.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList_ICMO.html"
@@ -180,7 +180,7 @@
             //
             var HModName = "QC_FiveMenOneRingList_ICMO";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
-            var titleData = ["娴佽浆鍗d", "鍗曟嵁涓籭d", "鐗╂枡id", "鐢熶骇璧勬簮id", "鑱屽憳id", "妯″叿id", "璁惧id", "HEntryID", "鐢熶骇璁㈠崟涓籭d", "ParentID"];
+            var titleData = ["娴佽浆鍗d", "鍗曟嵁涓籭d", "鐗╂枡id", "鐢熶骇璧勬簮id", "鑱屽憳id", "妯″叿id", "璁惧id", "HEntryID", "鐢熶骇璁㈠崟涓籭d", "ParentID","宸ュ簭id"];
             //鍒濆鍖栫晫闈�
             set_ClearBill();
             //#endregion
@@ -574,7 +574,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../../views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?openType=2', 'yes'],
+                    content: ['../../../views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?openType=3', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1225,7 +1225,7 @@
                         layer.open({
                             type: 2
                             , area: ['100%', '100%']
-                            , title: '鏌ョ湅鍙栨牱鍗�'
+                            , title: '鏌ョ湅鍋滃伐鍗�'
                             , closeBtn: 1
                             , shade: 0.6 //閬僵閫忔槑搴�
                             , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -1243,7 +1243,7 @@
                         layer.open({
                             type: 2
                             , area: ['100%', '100%']
-                            , title: '鏌ョ湅鍙栨牱鍗�'
+                            , title: '鏌ョ湅瀹屽伐鍗�'
                             , closeBtn: 1
                             , shade: 0.6 //閬僵閫忔槑搴�
                             , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -1255,11 +1255,30 @@
                             , cancel: function () {
                             }
                         })
+                    } else if (data.鍗曟嵁绫诲瀷 == "宸ュ簭娲惧伐鍗�") {
+                        var linterid = data.鍗曟嵁涓籭d;
+                        var HBillNo = data.鍗曟嵁鍙�;
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '鏌ョ湅宸ュ簭娲惧伐鍗�'
+                            , closeBtn: 1
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../../杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
+                            , resize: false,
+                            end: function () {
+                            }
+                            , cancel: function () {
+                            }
+                        })
                     }
 
                 } else if (obj.event == '鑱屽憳') {
                     var HName = data.鑱屽憳;
                     var HProcID = data.宸ュ簭id;
+                    var HMaterID = data.鐗╂枡id;
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
@@ -1268,7 +1287,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../../浜轰簨绠$悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
+                        , content: '../../浜轰簨绠$悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + '&HMaterid=' + HMaterID + ''
                         , resize: false,
                         end: function () {
                         }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index 7e082ae..9a8dc6f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -563,6 +563,7 @@
                     , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
                     , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true}
                     , { field: 'HBatchNo', title: '褰撳墠鎵规' }
+                    , { field: 'HProcID', title: 'HProcID', hide: true }
                     , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                     , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                     , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BarCodePrint.html"
new file mode 100644
index 0000000..c314878
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BarCodePrint.html"
@@ -0,0 +1,527 @@
+锘�<!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/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/grwebapp.js"></script>
+    <style type="text/css">
+
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 35%;
+        }
+
+        .layui-input-block {
+            margin-left: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-input-block">                               
+                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>鏍囩琛ユ墦</b></h1>
+                                <ul class="layui-tab-title">
+                                    <li lay-id="1" class="layui-this">SN鐮佽ˉ鎵�</li>
+                                    <li lay-id="2">涓鐮佽ˉ鎵�</li>
+                                    <li lay-id="3">鏍堟澘鐮佽ˉ鎵�</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">SN妯℃澘</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                    <select name="HPrintTemplate" id="HPrintTemplate" class="ForFilteringSchemes" lay-filter="HPrintTemplate"
+                                                            lay-verify="HPrintTemplate">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">SN鐮�</label>
+                                                <div class="layui-input-inline" style="width:600px;">
+                                                    <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off" style="float:left;width:410px;" onfocus="this.select();" placeholder="璇疯緭鍏ュ崟涓ˉ鎵撴潯鐮佺紪鍙凤紝涓嶆敮鎸佹壒閲忚ˉ鎵�">
+                                                    <button type="button" class="layui-btn" id="PrintBarCode" lay-submit="" lay-filter="PrintBarCode" style="float:left;">琛ユ墦鏉$爜</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-tab-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">涓妯℃澘</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPrintTemplate_ZX" id="HPrintTemplate_ZX" class="ForFilteringSchemes" lay-filter="HPrintTemplate_ZX"
+                                                        lay-verify="HPrintTemplate_ZX">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">涓鐮�</label>
+                                            <div class="layui-input-inline" style="width:600px;">
+                                                <input class="layui-input" name="HBarCode_ZX" id="HBarCode_ZX" autocomplete="off" style="float:left;width:410px;" onfocus="this.select();" placeholder="璇疯緭鍏ュ崟涓ˉ鎵撴潯鐮佺紪鍙凤紝涓嶆敮鎸佹壒閲忚ˉ鎵�">
+                                                <button type="button" class="layui-btn" id="PrintBarCode_ZX" lay-submit="" lay-filter="PrintBarCode_ZX" style="float:left;">琛ユ墦鏉$爜</button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-tab-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏍堟澘妯℃澘</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPrintTemplate_ZB" id="HPrintTemplate_ZB" class="ForFilteringSchemes" lay-filter="HPrintTemplate_ZB"
+                                                        lay-verify="HPrintTemplate_ZB">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏍堟澘鐮�</label>
+                                            <div class="layui-input-inline" style="width:600px;">
+                                                <input class="layui-input" name="HBarCode_ZB" id="HBarCode_ZB" autocomplete="off" style="float:left;width:410px;" onfocus="this.select();" placeholder="璇疯緭鍏ュ崟涓ˉ鎵撴潯鐮佺紪鍙凤紝涓嶆敮鎸佹壒閲忚ˉ鎵�">
+                                                <button type="button" class="layui-btn" id="PrintBarCode_ZB" lay-submit="" lay-filter="PrintBarCode_ZB" style="float:left;">琛ユ墦鏉$爜</button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>                
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //鏌ヨ鏉′欢
+            var option = [];
+            var option_New = [];
+            var sWhere = "";
+            var HModName = "Cj_BarCodePrint";
+            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var HWhetherToPrint = true; //鏄惁鎵撳嵃
+            var ModRightName = "Gy_BarCodeBillList";    //妯″潡鏉冮檺鍙傛暟
+            var HMaker = sessionStorage["HUserName"]
+            //#endregion                                 
+              
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
+
+            function CheckModRight() {
+                layer.load(3);
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                    success: function (d) {
+                        if (d.count == 1) {
+                        }
+                        else {
+                            layer.msg(d.Message, {
+                                icon: 0, time: 3000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                if (linterid == undefined) {
+                                    //鍏抽棴椤电
+                                    Pub_Close(2);
+                                }
+                                else {
+                                    //鍏抽棴椤电
+                                    Pub_Close(1);
+                                }
+                            });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                layer.closeAll("loading");
+            }
+            //#endregion
+
+            //鑾峰彇SN鎵撳嵃妯℃澘
+            getTem_SN();
+            //鑾峰彇涓鎵撳嵃妯℃澘
+            getTem_ZX();
+            //鑾峰彇鏍堟澘鎵撳嵃妯℃澘
+            getTem_ZB();
+            //#endregion                     
+                      
+            //琛ユ墦SN鏉$爜
+            form.on('submit(PrintBarCode)', function (data) {
+                PrintBarCode();
+            })
+            //琛ユ墦涓鏉$爜
+            form.on('submit(PrintBarCode_ZX)', function (data) {
+                PrintBarCode_ZX();
+            })
+            //琛ユ墦鏍堟澘鏉$爜
+            form.on('submit(PrintBarCode_ZB)', function (data) {
+                PrintBarCode_ZB();
+            })
+
+            form.on('select(HPrintTemplate)', function (data) {
+                // 2. 鑾峰彇閫変腑鐨勫��
+                const selectedValue = data.value;
+
+                // 3. 淇濆瓨鍒� localStorage锛堥敭鍚嶄负 "BlueToothselectedTemplate"锛�
+                localStorage.setItem('SNselectedTemplate', selectedValue);
+
+                console.log('宸蹭繚瀛橀�夋嫨鐨勬ā鏉�:', selectedValue);
+            });
+
+            form.on('select(HPrintTemplate_ZX)', function (data) {
+                // 2. 鑾峰彇閫変腑鐨勫��
+                const selectedValue = data.value;
+
+                // 3. 淇濆瓨鍒� localStorage锛堥敭鍚嶄负 "BlueToothselectedTemplate"锛�
+                localStorage.setItem('ZXselectedTemplate', selectedValue);
+
+                console.log('宸蹭繚瀛橀�夋嫨鐨勬ā鏉�:', selectedValue);
+            });
+
+            form.on('select(HPrintTemplate_ZB)', function (data) {
+                // 2. 鑾峰彇閫変腑鐨勫��
+                const selectedValue = data.value;
+
+                // 3. 淇濆瓨鍒� localStorage锛堥敭鍚嶄负 "BlueToothselectedTemplate"锛�
+                localStorage.setItem('ZBselectedTemplate', selectedValue);
+
+                console.log('宸蹭繚瀛橀�夋嫨鐨勬ā鏉�:', selectedValue);
+            });
+
+            //SN鏉$爜缂栧彿鍥炶溅鏂规硶
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    PrintBarCode();
+                }
+            });
+
+            //涓鏉$爜缂栧彿鍥炶溅鏂规硶
+            $('#HBarCode_ZX').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    PrintBarCode_ZX();
+                }
+            });
+
+            //鏍堟澘鏉$爜缂栧彿鍥炶溅鏂规硶
+            $('#HBarCode_ZB').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    PrintBarCode_ZB();
+                }
+            });
+                      
+            //閫�鍑�
+            form.on('submit(ToolExit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+           
+            //#region 鑾峰彇鎵撳嵃妯℃澘
+            function getTem_SN() {
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+                    data: { "HNumber": "HGy_BarCodeBill" },
+                    success: function (result) {
+                        var template = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                template += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+                            }
+                            $("#HPrintTemplate").append(template);
+                            $("#HPrintTemplate").val(localStorage.getItem('SNselectedTemplate'))
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            function getTem_ZX() {
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+                    data: { "HNumber": "HGy_BarCodeBill_MiddleBox" },
+                    success: function (result) {
+                        var template = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                template += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+                            }
+                            $("#HPrintTemplate_ZX").append(template);
+                            $("#HPrintTemplate_ZX").val(localStorage.getItem('ZXselectedTemplate'))
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            function getTem_ZB() {
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+                    data: { "HNumber": "HGy_BarCodeBill_ZB" },
+                    success: function (result) {
+                        var template = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                template += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+                            }
+                            $("#HPrintTemplate_ZB").append(template);
+                            $("#HPrintTemplate_ZB").val(localStorage.getItem('ZBselectedTemplate'))
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+
+            
+            //琛ユ墦SN鏉$爜
+            function PrintBarCode() {
+                var HBarCode = $("#HBarCode").val();
+
+                var sWhere = "select top 1 a.HItemID,HBarCode 鏉$爜缂栧彿,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HBarCode = '" + HBarCode + "'";
+
+                if ($("#HPrintTemplate").val().indexOf("闂荤尞") !== -1) {
+                    sWhere = "exec h_p_IF_BarCodeBillList_XWPrint '" + HBarCode + "'"
+                }
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                            if (data.data.length != 0) {
+                                if (data.data[0].SKU == "") {
+                                    layer.msg("鐗╂枡SKU鏈淮鎶わ紝璇疯仈绯荤鐞嗗憳纭锛�");
+                                    return;
+                                }
+
+                                var dataPrint = [];
+                                for (var i = 0; i < data.data.length; i++) {
+                                    dataPrint.push(data.data[i])
+                                }
+
+                                var Customer = {
+                                    "Table": dataPrint
+                                }
+
+                                var args = {
+                                    type: "print",//鎵撳嵃妯″紡
+                                    //type: "preview",//棰勮妯″紡
+                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate").val() + ".grf"),
+                                    data: Customer
+                                };
+
+                                console.log("鎵撳嵃SN鏉$爜锛�" + data.data[0].鏉$爜缂栧彿);
+  
+                                webapp_ws_ajax_run(args);                                                             
+
+                            } else {
+                                layer.msg("鏌ユ棤鏁版嵁!");
+                            }
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5 });
+                    }
+                })
+            }
+
+            //琛ユ墦涓鏉$爜
+            function PrintBarCode_ZX() {
+                var HBarCode = $("#HBarCode_ZX").val();
+
+                var sWhere = "exec h_p_Gy_GetCaseCodeInfo '" + HBarCode + "'";
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                            if (data.data.length != 0) {
+                           
+                                var dataPrint = [];
+                                for (var i = 0; i < data.data.length; i++) {
+                                    dataPrint.push(data.data[i])
+                                }
+
+                                var Customer = {
+                                    "Table": dataPrint
+                                }
+
+                                var args = {
+                                    type: "print",//鎵撳嵃妯″紡
+                                    //type: "preview",//棰勮妯″紡
+                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate_ZX").val() + ".grf"),
+                                    data: Customer
+                                };
+
+                                console.log("鎵撳嵃涓鏉$爜锛�" + data.data[0].鏉$爜缂栧彿);
+
+                                webapp_ws_ajax_run(args);
+                              
+                            } else {
+                                layer.msg("鏌ユ棤鏁版嵁!");
+                            }
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5 });
+                    }
+                })
+            }
+
+            //琛ユ墦鏍堟澘鏉$爜
+            function PrintBarCode_ZB() {
+                var HBarCode = $("#HBarCode_ZB").val();
+
+                var sWhere = "exec h_p_Gy_GetPalletBarInfo '" + HBarCode + "'";
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                            if (data.data.length != 0) {
+
+                                var dataPrint = [];
+                                for (var i = 0; i < data.data.length; i++) {
+                                    dataPrint.push(data.data[i])
+                                }
+
+                                var Customer = {
+                                    "Table": dataPrint
+                                }
+
+                                var args = {
+                                    type: "print",//鎵撳嵃妯″紡
+                                    //type: "preview",//棰勮妯″紡
+                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate_ZB").val() + ".grf"),
+                                    data: Customer
+                                };
+
+                                console.log("鎵撳嵃鏍堟澘鏉$爜锛�" + data.data[0].鏉$爜缂栧彿);
+
+                                webapp_ws_ajax_run(args);
+
+                            } else {
+                                layer.msg("鏌ユ棤鏁版嵁!");
+                            }
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5 });
+                    }
+                })
+            }
+
+         
+            //#endregion
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
index 463601d..86c6ee0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
@@ -328,8 +328,10 @@
             //SN鐮佸洖杞︽柟娉�
             $('#HBarcode_SN').on('keydown', function (event) {
                 if (event.keyCode == 13) {
-                    get_FastQuery(2);
-                }
+                    //get_FastQuery(2);
+                    $('#HBarcode_SN').val($('#HBarcode_SN').val() + ',')
+                    //console.log($('#HBarcode_SN').val());
+                }               
             });
 
             //鏍堟澘鐮佸洖杞︽柟娉�
@@ -551,6 +553,7 @@
                 //    sWhere += " and DSN like '%" + HBarcode_SN + "%'";
                 //}
                 if (HBarcode_SN) {
+                    HBarcode_SN = HBarcode_SN.substring(0, HBarcode_SN.length - 1)
                     HBarcode_SN = HBarcode_SN.replace(/锛�/g, ',')
                         .split(',')
                         .map(item => `'${item.trim()}'`)
@@ -565,12 +568,12 @@
                 if (HBarcode_ZX) {
                     sWhere += "and  涓鐮� like '%" + HBarcode_ZX + "%'";
                 }
-                //if (HDate) {
-                //    sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HDate + "'";
-                //}
-                //if (HDate1) {
-                //    sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HDate1 + "'";
-                //}
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
 
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
index a734252..36e6336 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
@@ -31,21 +31,20 @@
                         <div class="layui-row">
                             <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: left">
                                 <label class="layui-form-label" style="padding-left:0px" id="">闀洉鐮�:</label>
-                                <input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 500px;">
+                                <input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 400px;">
                             </div>
                             <button class="layui-btn layui-btn-normal" style="" type="button" lay-submit="" lay-filter="btnChange" id="btnChange">鍙樻洿</button>
 
                             <button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
                             <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: right">
-                                <label class="layui-form-label" style="padding-left:0px" id="">SN鐮�:</label>
-                                <input type="text" class="layui-input" name="HBarCode_SN2" lay-verify="HBarCode_SN2" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN2" style="width: 500px;">
+                                <label class="layui-form-label" style="padding-left:0px" id="">69鐮�:</label>
+                                <input type="text" class="layui-input" name="HBarCode_SN3" lay-verify="HBarCode_SN3" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN3" style="width: 400px;">
                             </div>
-
-
-
+                            <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: right">
+                                <label class="layui-form-label" style="padding-left:0px" id="">SN鐮�:</label>
+                                <input type="text" class="layui-input" name="HBarCode_SN2" lay-verify="HBarCode_SN2" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN2" style="width: 400px;">
+                            </div>
                         </div>
-
-
                     </div>
                     <div class="layui-tab layui-tab-card" style="float: left; background-color: white;height:200px;width:100%">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -115,6 +114,12 @@
                                                 <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;">
                                                 <input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0">
                                                 <input type="hidden" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" id="HICMOEntryID" value="0">
+                                            </div>
+                                        </div>
+                                         <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">鏍囩69鐮侊細</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HLabelCode" lay-verify="HLabelCode" id="HLabelCode" style="" placeholder="璇疯緭鍏ユ湰娆$敓浜х殑鏍囩69鐮�">
                                             </div>
                                         </div>
                                     </div>
@@ -331,8 +336,54 @@
                     $("#HBarCode_SN").focus();
                     return
                 }
-                if (HBarCode) {
+                if (HBarCode && ($("#HMaterNumber").val() != '12020042' && $("#HMaterNumber").val() != '12020037')) {
                     txtHBarCodeSN_KeyDown(HBarCode);
+                } else {
+                    if ($("#HBarCode_SN").val() != HBarCode) {
+                        layer.confirm("褰╃洅SN鐮佹牎楠屽け璐ヨ妫�鏌�,褰╃洅SN鐮�:" + HBarCode, {
+                            btn: ['纭畾'] //鎸夐挳
+                        });
+                        $("#HBarCode_SN2").val("");
+                        $("#HBarCode_SN2").focus();
+                        return
+                    } else {
+                        $("#HBarCode_SN3").focus();
+                    }
+                }
+            }
+        });
+
+        //69鐮佸洖杞︽柟娉�
+        $('#HBarCode_SN3').on('keydown', function (event) {
+            if ( $("#HMaterNumber").val() != '12020042' && $("#HMaterNumber").val() != '12020037') {
+                layer.msg("鐗╂枡涓嶇敤鏍¢獙69鏍囩");
+                return
+            }
+
+            var HBarCode2 = $('#HBarCode_SN2').val();
+            var HLabelCode = $('#HLabelCode').val();
+            var HBarCode3 = $('#HBarCode_SN3').val();
+            if (event.keyCode == 13) {
+                if (HBarCode2 == "" || HBarCode2 == null) {
+                    layer.msg("鏈壂sn鐮佽鍏堟壂sn鐮�");
+                    $("#HBarCode_SN2").focus();
+                    return
+                }
+
+                if (HLabelCode == "" || HLabelCode == null) {
+                    layer.msg("鏍囩69鐮佹湭鎵嬪伐杈撳叆锛岃杈撳叆鍚庡湪杩涜鏍¢獙姣斿銆�");
+                    $("#HLabelCode").focus();
+                    return
+                }
+
+                if (HLabelCode != HBarCode3) {
+                    layer.msg("69鏍囩鏍¢獙澶辫触锛佹寚瀹�69鐮侊細" + HLabelCode + "锛屾壂鎻�69鐮侊細" + HBarCode3);
+                    $("#HLabelCode").focus();
+                    return
+                }
+
+                if (HBarCode2) {
+                    txtHBarCodeSN_KeyDown(HBarCode2);
                 }
             }
         });
@@ -553,6 +604,7 @@
                         $("#HBarCode_SN").prop("readonly", false);
                         $("#HBarCode_SN").val("");
                         $("#HBarCode_SN2").val("");
+                        $("#HBarCode_SN3").val("");
                         $("#HBarCode_SN").focus();
 
                         $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
@@ -560,6 +612,7 @@
                     }
                     else {
                         $("#HBarCode_SN2").val("");
+                        $("#HBarCode_SN3").val("");
                         layer.close(indexs);
                         layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
                     }
@@ -567,6 +620,7 @@
                 },
                 error: function (err) {
                     $("#HBarCode_SN2").val("");
+                    $("#HBarCode_SN3").val("");
                     layer.close(indexs);
                     layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
                 }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
index 31a431a..c4237e0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <title>宸ュ簭娲惧伐缂栬緫</title>
+    <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>
@@ -13,6 +14,7 @@
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
     <script src="../../../layuiadmin/SetColumn.js"></script>
+
     <style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -27,6 +29,7 @@
         .layui-table-cell {
             overflow: visible !important;
         }
+
         .layui-table th, .layui-table td {
             white-space: nowrap; /* 涓嶆崲琛� */
             overflow: hidden; /* 瓒呭嚭鍐呭闅愯棌 */
@@ -58,10 +61,7 @@
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
                             <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>-->
-                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>-->
-                        </div>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>                          
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <h1 style="text-align:center;"><b>宸ュ簭娴佽浆鍗℃淳宸�</b></h1>
@@ -910,11 +910,13 @@
                         $("#HExplanation").val(result.data[0]["鎽樿"]);
                         $("#HRemark").val(result.data[0]["琛ㄥご澶囨敞"]);                               
 
+
                         var rowdata = [];
                         for (var i = 0; i < result.data.length; i++) {
                             //瀛愯〃  璧嬪��
                             rowdata.push({
-                                "HProcNo": result.data[i]["娴佹按鍙�"], "HMaterID": result.data[i]["浜у搧ID"], "HMaterNumber": result.data[i]["浜у搧浠g爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["鍗曚綅ID"], "HUnitNumber": result.data[i]["璁¢噺鍗曚綅浠g爜"], "HUnitName": result.data[i]["璁¢噺鍗曚綅鍚嶇О"],
+                                "HSourceInterID": result.data[i]["HSourceInterID"], "HSourceEntryID": result.data[i]["HSourceEntryID"], "HSourceBillNo": result.data[i]["宸ュ簭娴佽浆鍗″彿"],
+                                "HProcNo": result.data[i]["娴佹按鍙�"], "HProcName": result.data[i]["宸ュ簭鍚嶇О"],"HMaterID": result.data[i]["浜у搧ID"], "HMaterNumber": result.data[i]["浜у搧浠g爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["鍗曚綅ID"], "HUnitNumber": result.data[i]["璁¢噺鍗曚綅浠g爜"], "HUnitName": result.data[i]["璁¢噺鍗曚綅鍚嶇О"],
                                 "HSourceID": result.data[i]["鐢熶骇璧勬簮ID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠g爜"], "HSourceName": result.data[i]["鐢熶骇璧勬簮鍚嶇О"], "HWorkerID": result.data[i]["鎿嶄綔宸D"], "HWorkerNumber": result.data[i]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[i]["鎿嶄綔宸ュ悕绉�"],
                                 "HGroupID": result.data[i]["鐝粍ID"], "HGroupNumber": result.data[i]["鐝粍浠g爜"], "HGroupName": result.data[i]["鐝粍鍚嶇О"], "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": result.data[i]["娲惧伐鏁伴噺"], "HBatchNo": result.data[i]["鎵规"], "HPlanBeginDate": result.data[i]["瑕佹眰寮�宸ユ棩鏈�"],
                                 "HPlanEndDate": result.data[i]["瑕佹眰瀹屽伐鏃ユ湡"]
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
index 1a72627..bd1dbe4 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
@@ -503,8 +503,14 @@
                             var col = [];
                             var totalArray = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
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_OtherOutBillList.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_OtherOutBillList.html"
index 2543afc..0709f13 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_OtherOutBillList.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_OtherOutBillList.html"
@@ -631,8 +631,14 @@
                             var col = [];
                             var totalArray = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
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_SellOutBillList.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_SellOutBillList.html"
index 733b309..e8691f7 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_SellOutBillList.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_SellOutBillList.html"
@@ -134,18 +134,7 @@
                                                 <input type="text" class="layui-input ForFilteringSchemes"
                                                     name="HMaterName" id="HMaterName" style="width:190px;">
                                             </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="HBillSubType" id="HBillSubType" lay-filter="HBillSubType" style="" disabled>
-                                                    <option value="0" selected="selected"></option>
-                                                    <option value="宸ョ▼绫�">宸ョ▼绫�</option>
-                                                    <option value="浠诲姟绫�">浠诲姟绫�</option>
-                                                </select>
-                                            </div>
-                                        </div>-->
+                                        </div>                                        
                                     </div>
                                     <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                         <div class="layui-inline">
@@ -158,18 +147,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                lay-filter="Comparator" style="width:190px;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -192,18 +177,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
-                                                lay-filter="Comparator1" style="width:190px;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -227,18 +208,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
-                                                lay-filter="Comparator2" style="width:190px;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
-                                                    <=< /option>
-                                                <option value="<">
-                                                    << /option>
-                                                <option value="<>">
-                                                    <>
-                                                </option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -893,8 +870,14 @@
                             var col = [];
                             var totalArray = ["浠舵暟"];
                             //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillList.html"
index 07f5575..4e605e8 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillList.html"
@@ -148,18 +148,14 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
-                                                    lay-filter="Comparator" style="width:190px;">
+                                                        lay-filter="Comparator" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
                                                     <option value=">">></option>
-                                                    <option value="<=">
-                                                        <=< /option>
-                                                    <option value="<">
-                                                        << /option>
-                                                    <option value="<>">
-                                                        <>
-                                                    </option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -182,18 +178,14 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
-                                                    class="ForFilteringSchemes" style="width:190px;">
+                                                        class="ForFilteringSchemes" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
                                                     <option value=">">></option>
-                                                    <option value="<=">
-                                                        <=< /option>
-                                                    <option value="<">
-                                                        << /option>
-                                                    <option value="<>">
-                                                        <>
-                                                    </option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -216,18 +208,14 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
-                                                    class="ForFilteringSchemes" style="width:190px;">
+                                                        class="ForFilteringSchemes" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
                                                     <option value=">">></option>
-                                                    <option value="<=">
-                                                        <=< /option>
-                                                    <option value="<">
-                                                        << /option>
-                                                    <option value="<>">
-                                                        <>
-                                                    </option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -300,7 +288,7 @@
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion 
-            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID","鍗曟嵁绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //杩囨护鏉′欢鐨刢lass绫�
@@ -534,9 +522,14 @@
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
                             var totalArray = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -925,120 +918,9 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
                 }
 
-            }
-            //鑾峰彇鍒楀
-            function getColumnsWidth() {
-                var result = [];
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                //鑾峰彇鍒楀
-                $.ajax({
-                    url: GetWEBURL() + '/Cg_POOrderBill/list',
-                    async: false,
-                    type: "Get",
-                    dataType: "json",
-                    data: { "colNum": colNum, "Name": Name },
-                    success: function (data1) {
-                        if (data1.code == 1) {
-                            result = data1.data;
-                        }
-                        else if (data1.code == -1) {
-
-                        }
-                        else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-
-                return result;
-            }
-            //淇濆瓨鍒楀
-            function set_SaveGridColWidth() {
-                var arr = [];
-                // 鍒楁暟
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                for (var i = 0; i <= colNum; i++) {
-                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
-                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
-                    if (colName != "" && colName != null) {
-                        arr.push(colWidth == -1 ? 200 : colWidth);
-                    }
-                }
-                arr.unshift(40); //棣栦綅杩藉姞
-                $.ajax({
-                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
-                    async: false,
-                    type: "POST",
-                    dataType: "json",
-                    data: { "myMap": JSON.stringify(arr), "Name": Name },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            layer.alert(data1.Message, { icon: 1 });
-                        } else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-                //璁剧疆璧嬪�煎垪瀹�
-                var colWidth = getColumnsWidth();
-                if (colWidth == "" || colWidth == []) {
-
-                }
-                else {
-                    $.each(columns, function (x, m) {
-                        m["width"] = colWidth[x];
-                    });
-                }
-                get_FastQuery(table, option);
-            }
-            //榛樿鍒楀
-            function set_DefaultGridColWidth() {
-                var arr = [];
-                // 鍒楁暟
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                for (var i = 0; i <= colNum; i++) {
-                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
-                    if (colName != "" && colName != null) {
-                        arr.push(200);   //榛樿瀹藉害200
-                    }
-                }
-                arr.unshift(40); //棣栦綅杩藉姞
-                $.ajax({
-                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
-                    async: false,
-                    type: "POST",
-                    dataType: "json",
-                    data: { "myMap": JSON.stringify(arr), "Name": Name },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            layer.alert(data1.Message, { icon: 1 });
-
-                        } else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-                //璁剧疆璧嬪�煎垪瀹�
-                var colWidth = getColumnsWidth();
-                if (colWidth == "" || colWidth == []) {
-
-                }
-                else {
-                    $.each(columns, function (x, m) {
-                        m["width"] = colWidth[x];
-                    });
-                }
-                get_FastQuery(table, option);
-            }
+            }            
             //蹇�熻繃婊�
             function get_FastQuery(table, option) {
-                var HStatus = $("select[name='HStatus']").val();//鐘舵��
                 var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -1050,23 +932,7 @@
                 var HStockIn = $("#HStockIn").val();
                 var HStocOut = $("#HStocOut").val();
                 var HMakerMan = $("#HMakerMan").val();
-                //if (HStatus) {
-                //    switch (HStatus) {
-                //        case '-1':   //鍏ㄩ儴
-                //            sWhere += "";
-                //            break;
-                //        case '1':    //鏈垎閰�
-                //            sWhere += " and 涓氬姟鐘舵��='鏈垎閰�'";
-                //            break;
-                //        case '2':    //宸插鏍�
-                //            sWhere += " and 涓氬姟鐘舵��='宸插垎閰�'";
-                //            break;
-                //        case '3':    //宸插叧闂�
-                //            sWhere += " and 涓氬姟鐘舵��='宸插彂甯�'";
-                //        default:
-
-                //    }
-                //}var ColName = $("#ColName").val();//澶嶉�夋
+                var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
                 var ColName1 = $("#ColName1").val();//澶嶉�夋
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index 1960469..1ca2f67 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -312,7 +312,7 @@
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
-            var titleData = ["鍗曟嵁ID", "hsubid", "HDeptID", "鎵撴祮浜哄唴鐮�", "瀹㈡埛鍐呯爜", "涓讳骇鍝佸唴鐮�", "HMaterID", "HUnitID", "浠诲姟鍗曞唴鐮�", "浠诲姟鍗曞瓙鍐呯爜", "宸ュ簭娴佽浆鍗″唴鐮�", "宸ュ簭娴佽浆鍗″瓙鍐呯爜", 'HMaterRuleExternType', 'HMainSourceBillType'];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["鍗曟嵁ID", "hsubid", "HDeptID", "鎵撴祮浜哄唴鐮�", "瀹㈡埛鍐呯爜", "涓讳骇鍝佸唴鐮�", "HMaterID", "HUnitID", "浠诲姟鍗曞唴鐮�", "浠诲姟鍗曞瓙鍐呯爜", "宸ュ簭娴佽浆鍗″唴鐮�", "宸ュ簭娴佽浆鍗″瓙鍐呯爜", 'HMaterRuleExternType', 'HMainSourceBillType','鍗曟嵁绫诲瀷'];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //杩囨护鏉′欢鐨刢lass绫�
@@ -843,11 +843,7 @@
                 if (HEndDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
                 }
-                if (subType) {
-                    sWhere += " and HBillSubType = N'" + subType + "'";  // 鏍规嵁閫掑叆鍗曟嵁绫诲瀷鐨勪笉鍚岀瓫閫変笉鍚岀殑鍗曟嵁
-                } else {
-                    sWhere += " and HBillSubType = N'1204'"
-                }
+
                 $.ajax({
                     url: GetWEBURL() + '/Kf_MateOutBill/GetMateOutBillList',
                     async: false,
@@ -859,13 +855,18 @@
                             var col = [];
                             var totalArray = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
-                            for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
-                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁                               
                                 if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
index 50dc24f..306bcb0 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
@@ -656,13 +656,19 @@
                             var col = [];
                             var totalArray = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
                             for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
-                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                
                                 if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
@@ -870,13 +876,11 @@
                     success: function (data1) {
                         if (data1.data.length != 0) {
 
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["hmainid", "HCusID", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hunitid", "hwhid", "hmaterid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁                            
 
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                 var dataCols = dataCol[i].split('|');
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {

--
Gitblit v1.9.1