From a636d17f2817ec0317149a26bfcfb9c31b26730d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 28 十一月 2025 08:33:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/环境检测单/QC_EnvironmentTestDotCheckBillList.html | 3
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 78
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx | 28
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 13
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 35
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 10
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html | 4
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkPackage.html | 1117 ++++++++++
WebTM/views/基础资料/公用基础资料/Gy_MaterialPackingRelation_Edit.html | 1258 +++++++++++
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 194 +
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldConkBookBill_PDA.html | 2
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 301 +
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html | 6
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 16
WebTM/views/基础资料/公用基础资料/Gy_BarCodeReport.html | 74
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldRepairWorkBill_PDA.html | 7
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 6
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html | 76
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_TK.html | 9
WebTM/views/基础资料/基础资料/Gy_Repair_Excel.html | 4
WebTM/views/基础资料/公用基础资料/Gy_MaterialPackingRelationList.html | 1201 +++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 5
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html | 8
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 2
WebTM/WebTM.csproj | 11
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 4
WebTM/views/IpadIndex.html | 6
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_DH.html | 834 +++++++
WebTM/views/grf/生产资源.grf | 222 ++
WebTM/views/案例代码/华远/HY_HistogramReport.html | 8
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html | 4
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx.cs | 17
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 16
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html | 53
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | 12
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 11
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 73
WebTM/WebTM.csproj.user | 2
WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_Packing_PDA.html | 35
WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_Pallet_PDA.html | 22
WebTM/views/grf/工序流转卡小标签.grf | 241 ++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html | 7
WebTM/views/生产管理/制造周期报表/Sc_ProductionCycleBillList.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 2
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html | 292 ++
WebTM/views/应收管理/报表分析/Xs_SellOutCompareToProductReport.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 68
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK2.html | 11
49 files changed, 6,096 insertions(+), 318 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 01e1479..0d818a2 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|2025-11-07T06:53:42.4049572Z;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|2025-11-27T01:52:45.8455378Z;False|2025-11-27T09:52:27.1660968+08:00;True|2025-11-20T15:28:35.1782374+08:00;False|2025-11-20T15:27:58.2912950+08:00;True|2025-11-17T11:28:38.8503182+08:00;True|2025-11-17T11:23:56.4734268+08:00;False|2025-11-17T11:23:36.4097197+08:00;True|2025-11-13T15:25:28.7953742+08:00;True|2025-11-13T14:27:31.1949834+08:00;True|2025-11-13T14:06:59.9226754+08:00;True|2025-11-13T14:06:35.1547300+08:00;False|2025-11-13T14:06:09.0757993+08:00;True|2025-11-12T14:43:27.0202870+08:00;True|2025-11-12T14:40:27.2254016+08:00;True|2025-11-12T14:37:20.2647679+08:00;True|2025-11-12T11:26:52.2724565+08:00;True|2025-11-12T11:17:22.1910757+08:00;False|2025-11-12T11:17:09.9827931+08:00;True|2025-11-11T11:17:42.2481252+08:00;True|2025-11-11T11:15:23.2002587+08:00;True|2025-11-11T11:06:44.0655665+08:00;False|2025-11-11T11:05:59.0473577+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>11/06/2025 18:55:11</publishTime>
+ <publishTime>11/20/2025 15:27:50</publishTime>
</File>
<File Include="bin/WebTM.pdb">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>11/06/2025 18:55:11</publishTime>
+ <publishTime>11/20/2025 15:27:50</publishTime>
</File>
<File Include="Download/WMS杞欢瀹夎鍖�.apk">
<publishTime>07/26/2025 12:50:47</publishTime>
@@ -2181,6 +2181,9 @@
<File Include="views/grf/宸ュ簭娴佽浆.grf">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
+ <File Include="views/grf/宸ュ簭娴佽浆鍗″皬鏍囩.grf">
+ <publishTime>11/13/2025 14:52:12</publishTime>
+ </File>
<File Include="views/grf/寮傚父绫诲瀷.grf">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
@@ -2427,7 +2430,7 @@
<publishTime>10/13/2025 14:38:37</publishTime>
</File>
<File Include="views/IpadIndex.html">
- <publishTime>09/12/2025 09:51:45</publishTime>
+ <publishTime>11/20/2025 13:18:46</publishTime>
</File>
<File Include="views/IpadStepIndex.html">
<publishTime>05/23/2025 09:19:17</publishTime>
@@ -3613,7 +3616,7 @@
<publishTime>09/05/2025 16:05:26</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
- <publishTime>10/13/2025 14:38:37</publishTime>
+ <publishTime>11/13/2025 15:24:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckNoteItem.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3915,7 +3918,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>10/13/2025 14:38:37</publishTime>
+ <publishTime>11/13/2025 14:16:27</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint_GXPG.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4167,7 +4170,10 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeBillList.aspx">
- <publishTime>08/07/2025 13:26:41</publishTime>
+ <publishTime>11/13/2025 14:17:18</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx">
+ <publishTime>11/13/2025 14:26:45</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4426,7 +4432,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_Repair_Excel.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>11/17/2025 17:40:33</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4560,7 +4566,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>11/13/2025 17:40:25</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadResult.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -5224,7 +5230,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鏁呴殰缁翠慨鍗昉DA/Sc_MouldConkBookBill_PDA.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>11/17/2025 17:35:02</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鏁呴殰缁翠慨鍗昉DA/Sc_MouldConkBookBill_PDAEdit.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5233,7 +5239,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鏁呴殰缁翠慨鍗昉DA/Sc_MouldRepairWorkBill_PDA.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>11/17/2025 17:54:23</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鏁呴殰缁翠慨鍗昉DA/Sc_MouldRepairWorkBill_PDAEdit.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5498,7 +5504,7 @@
<publishTime>06/13/2025 14:06:40</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
- <publishTime>10/17/2025 10:10:06</publishTime>
+ <publishTime>11/17/2025 18:22:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -5996,7 +6002,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">
- <publishTime>09/11/2025 10:19:52</publishTime>
+ <publishTime>11/12/2025 11:26:40</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6011,7 +6017,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">
- <publishTime>09/02/2025 12:21:18</publishTime>
+ <publishTime>11/12/2025 14:44:30</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6154,7 +6160,7 @@
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>11/05/2025 16:02:58</publishTime>
+ <publishTime>11/20/2025 15:27:47</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList_LookDown.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6214,7 +6220,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html">
- <publishTime>11/07/2025 14:53:05</publishTime>
+ <publishTime>11/07/2025 15:00:24</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6264,7 +6270,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">
- <publishTime>06/10/2025 12:07:38</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
<publishTime>11/04/2025 17:28:05</publishTime>
@@ -6642,7 +6648,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
- <publishTime>10/13/2025 14:38:37</publishTime>
+ <publishTime>11/20/2025 15:23:58</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillCheckQuery.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6662,7 +6668,7 @@
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.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>11/12/2025 09:36:41</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">
<publishTime>04/27/2021 08:56:48</publishTime>
@@ -6681,7 +6687,7 @@
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>11/05/2025 16:02:58</publishTime>
+ <publishTime>11/20/2025 15:27:47</publishTime>
</File>
<File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -6691,7 +6697,7 @@
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.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>11/12/2025 09:36:41</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillListQuery.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -7123,11 +7129,14 @@
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
+ <File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill_XW.html">
+ <publishTime>11/11/2025 10:59:55</publishTime>
+ </File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html">
- <publishTime>11/05/2025 16:02:58</publishTime>
+ <publishTime>11/11/2025 11:17:33</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckOtherBillList.html">
<publishTime>09/17/2025 14:39:06</publishTime>
@@ -7262,7 +7271,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillList.html">
- <publishTime>06/24/2025 14:24:04</publishTime>
+ <publishTime>11/17/2025 11:28:21</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillList_PDA.html">
<publishTime>06/24/2025 10:00:32</publishTime>
@@ -7397,7 +7406,7 @@
<publishTime>07/22/2021 08:55:24</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>11/05/2025 16:02:58</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
<publishTime>10/13/2025 14:38:37</publishTime>
@@ -7519,22 +7528,22 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_batch.html">
- <publishTime>11/05/2025 16:02:58</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_batchKeyElement.html">
- <publishTime>10/24/2025 11:53:31</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_checkSN.html">
- <publishTime>11/05/2025 16:02:58</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_generateCaseCode.html">
- <publishTime>10/24/2025 11:53:31</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_generateSNCode.html">
- <publishTime>11/05/2025 16:02:58</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_KeyElement.html">
- <publishTime>10/24/2025 11:53:31</publishTime>
+ <publishTime>11/11/2025 10:59:55</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_UnbindEdit.html">
<publishTime>10/24/2025 11:53:31</publishTime>
@@ -7781,7 +7790,7 @@
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>10/13/2025 14:38:37</publishTime>
+ <publishTime>11/13/2025 14:14:08</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -7812,6 +7821,9 @@
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_Copy_PL.html">
<publishTime>05/23/2025 09:19:19</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_dh.html">
+ <publishTime>11/20/2025 15:21:41</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_Exchange.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -8970,7 +8982,7 @@
</File>
<File Include="Web.config">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>11/05/2025 16:05:35</publishTime>
+ <publishTime>11/20/2025 15:28:05</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 4913295..3fdef40 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -464,6 +464,8 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelationList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
@@ -542,6 +544,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList2.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QC_TakeSampleCheckBillMainList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_Small.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_OutDoorBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInChangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderChangeBillList.aspx" />
@@ -784,6 +787,7 @@
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillHSEQ.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCheckQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCloseList.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillimport_WorkQty.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillToInvalidatedList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillWorkQty.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
@@ -917,6 +921,7 @@
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_generateSNCode.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkSN.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_generateCaseCode.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkPackage.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_UnbindEdit.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_UnbindList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_KeyElement.html" />
@@ -940,6 +945,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangementHEmp.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillLIst_QueryCheckRecord.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_DH.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Exchange.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
@@ -1550,6 +1556,7 @@
<Content Include="views\grf\鎵樻潯鐮乢杩﹀崡1.grf" />
<Content Include="views\grf\绠辨潯鐮乢杩﹀崡1.grf" />
<Content Include="views\grf\鐗╂枡鏉＄爜_鍏磋揪.grf" />
+ <Content Include="views\grf\宸ュ簭娴佽浆鍗″皬鏍囩.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -2891,6 +2898,10 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs">
<DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_Small.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_Small.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_OutDoorBillList.aspx.cs">
<DependentUpon>xmlLBM_Xs_OutDoorBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c8b1f23..a8b6890 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒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 3969a46..22899a0 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,8 +6,9 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
// var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- // var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 4e3112e..88f1d96 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1665,6 +1665,12 @@
function WorkStaus(HSourceID1, workcode, HSourceInterID, btn) {
var flag = false;
var sWhere = ""; //鍚庣画鍦ㄥ瓨鍌ㄨ繃绋嬪姞鎺у埗 鏂规硶鏄� h_p_IpadIndexButton
+ sWhere = {
+ HSourceID: HSourceID1
+ , HICMOBillNo: workcode
+ , HInterID: HSourceInterID
+ , type: btn
+ }
//switch (btn) {
// case "寮�宸�":
// sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_Packing_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_Packing_PDA.html"
index 6c2ea1d..bd1a3b2 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_Packing_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_Packing_PDA.html"
@@ -39,18 +39,28 @@
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" lay-filter="HBarCode_Pack-BT" class="layui-btn" id="HBarCode_Pack-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺鍚堣</label>
+ </div>
+ <div class="layui-col-xs3">
+ <input type="text" name="HQtyTotal" id="HQtyTotal" lay-verify="HQtyTotal" value="0" autocomplete="off" class="layui-input" readonly>
+ </div>
</div>
</div>
<div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
- <div class="layui-row">
- <div class="layui-col-xs2">
- <label class="layui-form-label" style="width: 45px;padding-left: 0px;">鍖呮潯鐮�</label>
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width: 45px;padding-left: 0px;">鍖呮潯鐮�</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">浠舵暟</label>
</div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ <div class="layui-col-xs3">
+ <input type="text" name="HPieceTotal" id="HPieceTotal" lay-verify="HPieceTotal" value="0" autocomplete="off" class="layui-input" readonly>
</div>
</div>
</div>
@@ -694,6 +704,15 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
+
+ var HQtyTotal = 0;
+ var HPieceTotal = 0;
+ for (var i = 0; i < listOption.data.length; i++) {
+ HQtyTotal += listOption.data[i]["鏁伴噺"] * 1;
+ HPieceTotal += listOption.data[i]["鏉＄爜涓暟"] * 1;
+ }
+ $("#HQtyTotal").val(HQtyTotal);
+ $("#HPieceTotal").val(HPieceTotal);
}
else {
listOption.cols = [[
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_Pallet_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_Pallet_PDA.html"
index 8b4406a..6a025cc 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_Pallet_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_Pallet_PDA.html"
@@ -39,6 +39,12 @@
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" lay-filter="HBarCode_Pack-BT" class="layui-btn" id="HBarCode_Pack-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺鍚堣</label>
+ </div>
+ <div class="layui-col-xs3">
+ <input type="text" name="HQtyTotal" id="HQtyTotal" lay-verify="HQtyTotal" value="0" autocomplete="off" class="layui-input" readonly>
+ </div>
</div>
</div>
<div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
@@ -51,6 +57,12 @@
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">浠舵暟</label>
+ </div>
+ <div class="layui-col-xs3">
+ <input type="text" name="HPieceTotal" id="HPieceTotal" lay-verify="HPieceTotal" value="0" autocomplete="off" class="layui-input" readonly>
+ </div>
</div>
</div>
</div>
@@ -694,6 +706,16 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
+
+
+ var HQtyTotal = 0;
+ var HPieceTotal = 0;
+ for (var i = 0; i < listOption.data.length; i++) {
+ HQtyTotal += listOption.data[i]["鏁伴噺"] * 1;
+ HPieceTotal += listOption.data[i]["鏉＄爜涓暟"] * 1;
+ }
+ $("#HQtyTotal").val(HQtyTotal);
+ $("#HPieceTotal").val(HPieceTotal);
}
else {
listOption.cols = [[
diff --git "a/WebTM/views/grf/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241\345\260\217\346\240\207\347\255\276.grf" "b/WebTM/views/grf/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241\345\260\217\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..9c3ece0
--- /dev/null
+++ "b/WebTM/views/grf/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241\345\260\217\346\240\207\347\255\276.grf"
@@ -0,0 +1,241 @@
+锘縶
+ "Version":"6.8.2.5",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":9,
+ "Height":6,
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "ShowColLine":false,
+ "ShowRowLine":false,
+ "Border":{
+ "Styles":"[]"
+ },
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鍗曟嵁鍙�"
+ },
+ {
+ "Name":"浜у搧浠ｇ爜"
+ },
+ {
+ "Name":"浜у搧鍚嶇О"
+ },
+ {
+ "Name":"浜у搧瑙勬牸"
+ },
+ {
+ "Name":"娴佽浆鍗℃暟閲�",
+ "Type":"Integer"
+ },
+ {
+ "Name":"宸ヨ壓娴�"
+ },
+ {
+ "Name":"鐢熶骇璁㈠崟鍙�"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column1",
+ "Width":10.0013
+ }
+ ],
+ "ColumnContent":{
+ "Height":5.79438,
+ "ColumnContentCell":[
+ {
+ "Column":"Column1",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"Barcode",
+ "Name":"鍏磋揪浜岀淮鐮�",
+ "Left":5.60917,
+ "Top":3.41313,
+ "Width":4.20688,
+ "Height":2.19604,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "Text":"[#鍗曟嵁鍙�#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"鏉＄爜缂栫爜",
+ "Left":0.211667,
+ "Top":0.9525,
+ "Width":2.77813,
+ "Height":0.582083,
+ "Text":"宸ュ簭娴佽浆鍗″彿: "
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"鍗曟嵁鍙�",
+ "Left":2.80458,
+ "Top":0.9525,
+ "Width":3.99521,
+ "Height":0.582083,
+ "Text":"[#鍗曟嵁鍙�#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"鐗╂枡缂栫爜 鏍囩",
+ "Left":0.211667,
+ "Top":1.74625,
+ "Width":2.19604,
+ "Height":0.582083,
+ "Text":"鐗╂枡缂栫爜锛� "
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"鐗╂枡鍚嶇О 鏍囩",
+ "Left":0.211667,
+ "Top":2.54,
+ "Width":1.98438,
+ "Height":0.582083,
+ "Text":"鐗╂枡鍚嶇О锛�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"瑙勬牸鍨嬪彿 鏍囩",
+ "Left":0.211667,
+ "Top":3.33375,
+ "Width":1.98438,
+ "Height":0.582083,
+ "Text":"瑙勬牸鍨嬪彿锛�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"鏀舵枡閫氱煡鍗曡鐗╂枡鏁伴噺 鏍囩",
+ "Left":0.211667,
+ "Top":3.99521,
+ "Width":2.38125,
+ "Height":0.582083,
+ "Text":"娴佽浆鍗℃暟閲�:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"鐗╂枡缂栫爜",
+ "Left":2.19604,
+ "Top":1.74625,
+ "Width":6.00604,
+ "Height":0.582083,
+ "Text":"[#浜у搧浠ｇ爜#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"鐗╂枡鍚嶇О",
+ "Left":2.19604,
+ "Top":2.59292,
+ "Width":6.61458,
+ "Height":0.582083,
+ "Text":"[#浜у搧鍚嶇О#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"瑙勬牸鍨嬪彿",
+ "Left":2.19604,
+ "Top":3.33375,
+ "Width":4.20688,
+ "Height":0.582083,
+ "Text":"[#浜у搧瑙勬牸#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"鏁伴噺",
+ "Left":1.5875,
+ "Top":4.60375,
+ "Width":4.81542,
+ "Height":1.00542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":67500,
+ "Weight":400,
+ "Charset":134
+ },
+ "WordWrap":true,
+ "Text":"[#宸ヨ壓娴�#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":0.211667,
+ "Top":4.78896,
+ "Width":2.38125,
+ "Height":0.582083,
+ "Text":"宸ヨ壓娴�:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox2",
+ "Left":2.59292,
+ "Top":3.99521,
+ "Width":2.77813,
+ "Height":0.582083,
+ "Text":"[#娴佽浆鍗℃暟閲�#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox2",
+ "Left":0.211667,
+ "Top":0.211667,
+ "Width":2.77813,
+ "Height":0.582083,
+ "Text":"鐢熶骇璁㈠崟鍙�: "
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":2.40771,
+ "Top":0.211667,
+ "Width":3.99521,
+ "Height":0.582083,
+ "Text":"[#鐢熶骇璁㈠崟鍙�#]"
+ }
+ ]
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":0,
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":120000,
+ "Weight":400,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"Column1"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "Height":0
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":0
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/WebTM/views/grf/\347\224\237\344\272\247\350\265\204\346\272\220.grf" "b/WebTM/views/grf/\347\224\237\344\272\247\350\265\204\346\272\220.grf"
new file mode 100644
index 0000000..13b0f53
--- /dev/null
+++ "b/WebTM/views/grf/\347\224\237\344\272\247\350\265\204\346\272\220.grf"
@@ -0,0 +1,222 @@
+锘縊bject Report
+ Version='6.8.2.2'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=6
+ Height=8
+ Oriention=Landscape
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鐢熶骇璧勬簮缂栫爜'
+ End
+ Item
+ Name='璁惧缂栧彿'
+ End
+ Item
+ Name='璁惧鍚嶇О'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column1'
+ Width=7.9375
+ End
+ End
+Object ColumnContent
+ Height=5.79438
+ Items ColumnContentCell
+ Item
+ Column='Column1'
+ FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode4'
+ Left=2.32833
+ Top=2.2225
+ Width=3.20146
+ Height=3.20146
+ BarcodeType=QRCode
+ CheckSum=T
+ Text='[#鐢熶骇璧勬簮缂栫爜#]'
+ Object Font
+ Name='榛戜綋'
+ Size=67500,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Type=Line
+ Name='Line32'
+ Left=0.185208
+ Top=1.13771
+ Width=7.48771
+ End
+ Item
+ Type=Line
+ Name='Line33'
+ Left=0.185208
+ Top=0.185208
+ Height=5.5
+ U2D=F
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox18'
+ Left=1.74625
+ Top=1.16417
+ Width=5.84729
+ Height=0.846667
+ Object Font
+ Name='榛戜綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ WordWrap=T
+ Text='[#璁惧鍚嶇О#]'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox20'
+ Left=0.343958
+ Top=0.47625
+ Width=1.00542
+ Height=0.396875
+ Object Font
+ Name='榛戜綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='浠ｇ爜'
+ End
+ Item
+ Type=Line
+ Name='Line34'
+ Left=0.19
+ Top=5.65
+ Width=7.48771
+ End
+ Item
+ Type=Line
+ Name='Line35'
+ Left=0.185208
+ Top=0.185208
+ Width=7.5
+ End
+ Item
+ Type=Line
+ Name='Line36'
+ Left=0.185208
+ Top=2.01083
+ Width=7.48771
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox21'
+ Left=0.343958
+ Top=1.40229
+ Width=1.00542
+ Height=0.396875
+ Object Font
+ Name='榛戜綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='鍚嶇О'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox20'
+ Left=1.74625
+ Top=0.238125
+ Width=5.84729
+ Height=0.846667
+ Object Font
+ Name='榛戜綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ WordWrap=T
+ Text='[#鐢熶骇璧勬簮缂栫爜#]'
+ End
+ Item
+ Type=Line
+ Name='Line41'
+ Left=1.53458
+ Top=0.185208
+ Height=1.82
+ U2D=F
+ End
+ Item
+ Type=Line
+ Name='Line42'
+ Left=7.69
+ Top=0.19
+ Height=5.5
+ U2D=F
+ End
+ End
+ End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column1'
+ TextAlign=MiddleCenter
+ Text='Column1'
+ End
+ End
+End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+End
+End
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_BarCodeReport.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_BarCodeReport.html"
index b6b8742..35dd13b 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_BarCodeReport.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_BarCodeReport.html"
@@ -287,6 +287,10 @@
}
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鏍规嵁鍙傛暟璁剧疆绔欏埆鍒楄〃鏁版嵁
+ setStationListByParams();
+
//鍒濆鍖栦笅鎷夋
initSelects();
@@ -1042,6 +1046,76 @@
});
}
//#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 setStationListByParams() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 VRS锛歏RS涓嶈壇缁熻鍒嗘瀽锛� AVI锛欰VI涓嶈壇缁熻鍒嗘瀽锛汥ianCe锛氱數娴嬩笉鑹粺璁″垎鏋愶紱JiGuangGe锛氭縺鍏夊壊涓嶈壇缁熻鍒嗘瀽
+ if (openType == null || typeof (openType) == "undefined") { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = ["AOI1", "AOI2", "AOI3", "AOI4", "AVI", "鐢垫祴", "MRB"];
+ var Organization = "";
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i] + '">' + data[i] + '</option>';
+ }
+ $("#Station").empty();
+ $("#Station").append(Organization);
+ form.render('select');
+ }
+ else if (openType == "VRS") {
+ var data = ["AOI1", "AOI2", "AOI3", "AOI4"];
+ var Organization = "";
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i] + '">' + data[i] + '</option>';
+ }
+ $("#Station").empty();
+ $("#Station").append(Organization);
+ form.render('select');
+ }
+ else if (openType == "AVI") {
+ var data = ["AVI"];
+ var Organization = "";
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i] + '">' + data[i] + '</option>';
+ }
+ $("#Station").empty();
+ $("#Station").append(Organization);
+ form.render('select');
+ }
+ else if (openType == "DianCe") {
+ var data = ["鐢垫祴"];
+ var Organization = "";
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i] + '">' + data[i] + '</option>';
+ }
+ $("#Station").empty();
+ $("#Station").append(Organization);
+ form.render('select');
+ }
+ else if (openType == "JiGuangGe") {
+ var data = ["MRB"];
+ var Organization = "";
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i] + '">' + data[i] + '</option>';
+ }
+ $("#Station").empty();
+ $("#Station").append(Organization);
+ form.render('select');
+ }
+ }
+ //#endregion
});
</script>
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_CheckItem.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_CheckItem.html"
index 3426615..fa21857 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_CheckItem.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_CheckItem.html"
@@ -164,7 +164,7 @@
<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="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btnExcel" id="btnExcel"><i class="layui-icon layui-icon-export"></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="btnAdd" id="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
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_MaterialPackingRelationList.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_MaterialPackingRelationList.html"
new file mode 100644
index 0000000..169cdc0
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelationList.html"
@@ -0,0 +1,1201 @@
+锘�
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>浜у搧鍖呰鍏宠仈淇℃伅鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/SetColumn.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="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </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-inline" style="margin-left:5px;">
+ <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-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" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" 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="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" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="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" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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="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="set_AddNew" id="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" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <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="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="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-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>
+ <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_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></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>
+ <button type="button" class="layui-btn layui-btn-sm" 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" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+
+ //#region 鍏敤鍙橀噺
+ var option = []; //table琛ㄦ牸娓叉煋鍙傛暟
+ var sWhere = ""; //杩囨护鏉′欢
+ var HModName = "Gy_MaterialPackingRelationList"; //鐢ㄤ簬鍒楄缃�
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HBillType = "浜у搧鍖呰鍏宠仈淇℃伅鍒楄〃"; //鐢ㄤ簬鎸夐挳闅愯棌
+ var set_HideButton_ID = "toolbarDemo_ButtonSet"; //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+ var HClassTag = "ForFilteringSchemes"; //杩囨护鏉′欢鐨刢lass绫�
+ window.HModuleName = "浜у搧鍖呰鍏宠仈淇℃伅鍒楄〃"; //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HDefaultFilter = ""; //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0; //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳鎸夐挳 锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
+ break;
+ //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+ case 'btn-Drop':
+ set_DropBill(0);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn-DeDrop':
+ set_DropBill(1);
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ };
+ });
+ //#endregion
+
+ //#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 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(2);
+ });
+ //#endregion
+
+ //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+ //#endregion
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栫粍缁�
+ Organ();
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ //, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray = [];
+ 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 (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //table.render(option);
+
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+
+ ////鍒锋柊琛ㄦ牸鏁版嵁
+ ins = table.render(option);
+
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" & $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" & $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+ ColFilter();
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(number) {
+
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HBeginDate = $("#HBeginDate").val();//鎬荤粨浜�
+ var HEndDate = $("#HEndDate").val();//鍗曟嵁鐘舵��
+ var HOrgID = $("#HOrgID").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 (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HOrgID) {
+ sWhere += " and HOrgID = '" + HOrgID + "'";
+ }
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBillNo").val("");
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#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 = "";
+ }
+ //#endregion
+
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ 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);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '浜у搧鍖呰鍏宠仈淇℃伅-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialPackingRelation_Edit.html?OperationType=1&linterid=0&HSouceBillType='
+ ,btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ get_FastQuery();
+ }
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浜у搧鍖呰鍏宠仈淇℃伅-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialPackingRelation_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏂板浜у搧鍣ㄥ叿娓呭崟'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialPackingRelation_Edit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+
+ });
+ get_FastQuery();
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_MaterialPackingRelation/AuditGy_MaterialPackingRelation", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_MaterialPackingRelation/CloseGy_MaterialPackingRelation", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#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, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#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
+
+ //#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 params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and HBillStatus<3 and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+ var data = data1.data;
+ //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+ HInterID_Choose = data[0].hmainid;
+ //杩囨护鏂规鍐呯爜
+ HInterID = data[0].hmainid
+ //杩囨护鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";//杩囨护鏉′欢
+ var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+ var HValue = "";//杩囨护鍊�
+ var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ //缂栬緫
+ var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#endregion
+ });
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelation_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelation_Edit.html"
new file mode 100644
index 0000000..9681879
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelation_Edit.html"
@@ -0,0 +1,1258 @@
+锘�
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>浜у搧鍖呰鍏宠仈淇℃伅缂栬緫</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 2px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;width:185px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProjectName" lay-verify="HProjectName" id="HProjectName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HCusList" id="HCusList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" style=" width: 500px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍣ㄥ叿娓呭崟</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><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>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <!--琛屽垹闄�-->
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍛ㄨ浆瀹瑰櫒鏍囪)-->
+ <script type="text/html" id="HTransPackFlag">
+ <select name="HTransPackFlag" lay-filter="HTransPackFlag" id="HTransPackFlag{{d.LAY_TABLE_INDEX+1}}">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍙戣揣瀹瑰櫒鏍囪)-->
+ <script type="text/html" id="HSendPackFlag">
+ <select name="HSendPackFlag" lay-filter="HSendPackFlag" id="HSendPackFlag{{d.LAY_TABLE_INDEX+1}}">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(榛樿鍛ㄨ浆瀹瑰櫒鏍囪)-->
+ <script type="text/html" id="HDefaultTransPackFlag">
+ <select name="HDefaultTransPackFlag" lay-filter="HDefaultTransPackFlag" id="HDefaultTransPackFlag{{d.LAY_TABLE_INDEX+1}}">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(榛樿鍙戣揣瀹瑰櫒鏍囪)-->
+ <script type="text/html" id="HDefaultSendPackFlag">
+ <select name="HDefaultSendPackFlag" lay-filter="HDefaultSendPackFlag" id="HDefaultSendPackFlag{{d.LAY_TABLE_INDEX+1}}">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍚敤鏍囪)-->
+ <script type="text/html" id="HUseFlag">
+ <select name="HUseFlag" lay-filter="HUseFlag" id="HUseFlag{{d.LAY_TABLE_INDEX+1}}">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </script>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //#region 鍏叡鍙橀噺
+ var HModName = "Gy_MaterialPackingRelation_Edit";
+ var sBillType = "3339";
+ var option = [];
+ //#endregion
+
+ //#region 椤甸潰鍒濆鍖栧姞杞�
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ //#endregion
+
+ //#region 鏍规嵁鎿嶄綔绫诲瀷鍒濆鍖栭〉闈㈡暟鎹�
+ if (OperationType == null || OperationType == 1) {
+ //璁剧疆鎿嶄綔绫诲瀷
+ OperationType = 1;
+
+ //鍒濆鍖栬〃鏍�
+ get_InitGrid();
+
+ //鏄剧ず鍒楁暟鎹�
+ DisPlay_HideColumn();
+
+ //鍗曟嵁鍙峰垵濮嬪寲
+ createBillNo();
+
+ //绂佺敤缁勭粐缁勪欢
+ $("#HOrgID").attr("disabled", true);
+
+ //绂佺敤鎸夐挳
+ var num = 1;
+ HfBtn(num);
+ }
+ else if (OperationType == 2) {
+ //璁剧疆鎿嶄綔绫诲瀷
+ OperationType = 1;
+
+ //鍒濆鍖栬〃鏍�
+ get_InitGrid();
+
+ //鏄剧ず鍒楁暟鎹�
+ DisPlay_HideColumn();
+
+ //鏍规嵁澶嶅埗鍗曟嵁鍒濆鍖栭〉闈㈡暟鎹�
+ RoadBillMain(linterid);
+
+ //鍗曟嵁鍙峰垵濮嬪寲
+ createBillNo();
+
+ //绂佺敤缁勭粐缁勪欢
+ $("#HOrgID").attr("disabled", true);
+
+ //绂佺敤鎸夐挳
+ var num = 1;
+ HfBtn(num);
+ }
+ else if (OperationType == 3) {
+ //鍒濆鍖栬〃鏍�
+ get_InitGrid();
+
+ //鏄剧ず鍒楁暟鎹�
+ DisPlay_HideColumn();
+
+ //鏍规嵁缂栬緫鍗曟嵁鍐呯爜鍒濆鍖栭〉闈�
+ RoadBillMain(linterid);
+
+ //绂佺敤缁勭粐閫夐」
+ $("#HOrgID").attr("disabled", true);
+
+ //绂佺敤鎸夐挳
+ var num = 1;
+ HfBtn(num);
+ }
+ //#endregion
+ //#endregion
+
+ //#region 浜嬩欢鐩戝惉
+ //#region 鎿嶄綔鎸夐挳鐩戝惉
+ //#region 淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ set_AddNew(data);
+ });
+
+ //#region 鏁版嵁鏍￠獙
+ function AllowLoadData() { //闈炵┖楠岃瘉
+ var Result = true;
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^[1-9]+\d*$/; //姝ｆ暣鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ if ($("#HCusID").val() == 0 || $("#HCusID").val() == null || $("#HCusID").val() == "undefined") {
+ layer.msg("瀹㈡埛涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HMaterID").val() == 0 || $("#HMaterID").val() == null || $("#HMaterID").val() == "undefined") {
+ layer.msg("鐗╂枡淇℃伅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ var sSubTable = table.cache['mainTable'];
+ if (sSubTable.length < 1) {
+ layer.msg("鏄庣粏淇℃伅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (!sSubTable[i].HMouldID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝鍖呰瀹瑰櫒涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ //temp = sSubTable[i].HSNP + "";
+ //if (!ref.test(temp)) {
+ // layer.msg("绗�" + indexRow + "琛岋紝瀹瑰櫒鍖呰浜у搧鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暣鏁帮紒锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ }
+ return Result;
+ }
+ //#endregion
+
+ //#region 淇濆瓨HMaker
+ function set_AddNew(data) {
+
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+
+ //璁板綍鎿嶄綔绫诲瀷
+ var refSav = "";
+ if (OperationType == 1 || OperationType == 2) {
+ refSav = "Add";
+ }
+ if (OperationType == 3) {
+ refSav = "Update";
+ }
+ //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+ if (OperationType == 3) {
+ data.field.HUpdater = sessionStorage["HUserName"];
+ data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
+ $("#HUpdater").val(sessionStorage["HUserName"]);
+ $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_MaterialPackingRelation/SaveGy_MaterialPackingRelation",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ var num = 2;
+ HfBtn(num);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
+ });
+ //#endregion
+
+ //#region 瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBills(0);
+ });
+ //#endregion
+
+ //#region 鍙嶅鏍�
+ form.on('submit(set_AbandonCheck)', function (data) {
+ set_AbandonChecks(1);
+ });
+ //#endregion
+ //#endregion
+
+ //#region 琛ㄥご寮圭獥鐩戝惉浜嬩欢
+ //#region 閫夋嫨瀹㈡埛鎸夐挳
+ form.on('submit(HCusList)', function () {
+ get_checkCus();
+ });
+
+ //#region 瀹㈡埛閫夋嫨椤甸潰
+ function get_checkCus() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '瀹㈡埛鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) { //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable'); //鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HCusID").val(checkStatus.data[0].HItemID);
+ $("#HCusName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+ //#endregion
+
+ //#region 閫夋嫨鐗╂枡浠ｇ爜鎸夐挳
+ form.on('submit(btnSearchHMater)', function () {
+ get_checkSearchHMater();
+ });
+
+ //#region 鐗╂枡浠ｇ爜閫夋嫨椤甸潰
+ function get_checkSearchHMater() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#endregion
+ //#endregion
+
+ //#region 瀛愯〃鐩戝惉浜嬩欢
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMouldID": 0,
+ "HMouldNumber": "",
+ "HMouldName": "",
+ "HMouldType": "",
+ "HMouldPurpose": "",
+ "HMouldLength": 0,
+ "HMouldWidth": 0,
+ "HMouldHeight": 0,
+ "HMouldFoldHeight": 0,
+ "HSNP":0,
+ "HTransPackFlag": 0,
+ "HSendPackFlag": 0,
+ "HDefaultTransPackFlag": 0,
+ "HDefaultSendPackFlag": 0,
+ "HUseFlag": 0,
+ "HRemark": ""
+ };
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ //涓婄Щ
+ case 'btn-Up': btn_up();
+ break;
+ //涓嬬Щ
+ case 'btn-Under': btn_under();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ }
+ });
+
+ //#region 鏂板涓�琛�
+ function btnAddLine(NewRow) {
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ setSelectByTableRender(); //鏍规嵁瀛愯〃鍊奸噸鏂版覆鏌撲笅鎷夊垪琛�
+ layer.msg('澧炲姞涓�琛屾寜閽紒')
+ }
+ //#endregion
+
+ //#region 澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length); //鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1); //鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow)); //灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"]; //灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option); //灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ setSelectByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ }
+ }
+ //#endregion
+
+ //#region 涓婄Щ
+ function btn_up() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == 0) {
+ layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+ return;
+ }
+ tables.push(option.data[i - 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i - 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ setSelectByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
+
+ //#region 涓嬬Щ
+ function btn_under() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == option.data.length - 1) {
+ layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+ return;
+ }
+ tables.push(option.data[i + 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i + 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ setSelectByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ 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: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ 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 = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; 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("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#endregion
+
+ //#region 琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ });
+
+ //#region 琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
+ //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鍣ㄥ叿绠＄悊
+ if (obj.event == "HMould") {
+ //鎵撳紑鍣ㄥ叿绠＄悊灏忕獥浣�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妯″叿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HMouldID": checkStatus.data[0].hmainid,
+ "HMouldNumber": checkStatus.data[0].妯″叿缂栧彿,
+ "HMouldName": checkStatus.data[0].妯″叿鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ });
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //#endregion
+ //#endregion
+
+ //#region 瀛愯〃涓嬫媺鍒楄〃璁剧疆
+ //#region 鏍规嵁瀛愯〃鍊奸噸鏂版覆鏌撲笅鎷夊垪琛�
+ function setSelectByTableRender() {
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HTransPackFlag' + i + '').val(option.data[i - 1].HTransPackFlag);
+ $('#HSendPackFlag' + i + '').val(option.data[i - 1].HSendPackFlag);
+ $('#HDefaultTransPackFlag' + i + '').val(option.data[i - 1].HDefaultTransPackFlag);
+ $('#HDefaultSendPackFlag' + i + '').val(option.data[i - 1].HDefaultSendPackFlag);
+ $('#HUseFlag' + i + '').val(option.data[i - 1].HUseFlag);
+ }
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堝懆杞鍣ㄦ爣璁帮級
+ form.on('select(HTransPackFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (dataindex == index) {
+ value.HTransPackFlag = data.value * 1; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHTransPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ }
+ });
+ });
+ //#endregion
+ //#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈TransPackFlag鍊艰缃懆杞鍣ㄦ爣璁颁笅鎷夊垪琛�
+ function setSelectHTransPackFlagByTableRender() {
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HTransPackFlag' + i + '').val(option.data[i - 1].HTransPackFlag);
+ }
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堝彂璐у鍣ㄦ爣璁帮級
+ form.on('select(HSendPackFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (dataindex == index) {
+ value.HSendPackFlag = data.value * 1; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHSendPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ }
+ });
+ });
+ //#endregion
+ //#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈SendPackFlag鍊艰缃彂璐у鍣ㄦ爣璁颁笅鎷夊垪琛�
+ function setSelectHSendPackFlagByTableRender() {
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HSendPackFlag' + i + '').val(option.data[i - 1].HSendPackFlag);
+ }
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堥粯璁ゅ懆杞鍣ㄦ爣璁帮級
+ form.on('select(HDefaultTransPackFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (dataindex == index) {
+ value.HDefaultTransPackFlag = data.value * 1; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHDefaultTransPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈DefaultTransPackFlag鍊艰缃笅鎷夊垪琛�
+ }
+ });
+ });
+ //#endregion
+ //#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈DefaultTransPackFlag鍊艰缃粯璁ゅ懆杞鍣ㄦ爣璁颁笅鎷夊垪琛�
+ function setSelectHDefaultTransPackFlagByTableRender() {
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDefaultTransPackFlag' + i + '').val(option.data[i - 1].HDefaultTransPackFlag);
+ }
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堥粯璁ゅ彂璐у鍣ㄦ爣璁帮級
+ form.on('select(HDefaultSendPackFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (dataindex == index) {
+ value.HDefaultSendPackFlag = data.value * 1; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHDefaultSendPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ }
+ });
+ });
+ //#endregion
+ //#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈DefaultSendPackFlag鍊艰缃粯璁ゅ彂璐у鍣ㄦ爣璁颁笅鎷夊垪琛�
+ function setSelectHDefaultSendPackFlagByTableRender() {
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDefaultSendPackFlag' + i + '').val(option.data[i - 1].HDefaultSendPackFlag);
+ }
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堝惎鐢ㄦ爣璁帮級
+ form.on('select(HUseFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (dataindex == index) {
+ value.HUseFlag = data.value * 1; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHUseFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈UseFlag鍊艰缃笅鎷夊垪琛�
+ }
+ });
+ });
+ //#endregion
+ //#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈UseFlag鍊艰缃惎鐢ㄦ爣璁颁笅鎷夊垪琛�
+ function setSelectHUseFlagByTableRender() {
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HUseFlag' + i + '').val(option.data[i - 1].HUseFlag);
+ }
+ form.render('select');
+ }
+ //#endregion
+ //#endregion
+ //#endregion
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+ //#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 HfBtn(num) {
+ //鏂板 鏃� 绂佺敤鍏朵粬鎸夐挳
+ if (num == 1) {
+ $('#btn_LookDown').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#btn_print').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#btn_view').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);
+ } else if (num == 2) {
+ //姣忔鎭㈠鎸夐挳
+ $('#btn_LookDown').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#btn_print').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#btn_view').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#set_CloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#set_CancelCloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }
+ //#endregion
+
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鐢熸垚鍗曟嵁鍙�
+ function createBillNo() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": sBillType },
+ success: function (d) {
+ //鍒濆鍖栧崟鎹唴鐮佷笌鍗曟嵁鍙�
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ }
+ //#endregion
+
+ //#region 瀛愯〃鍒濆鍖�
+ function get_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , height: 400
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMouldID', title: 'HMouldID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HMouldNumber', title: '鍖呰瀹瑰櫒浠ｇ爜', edit: 'true', event: "HMould" }
+ , { field: 'HMouldName', title: '鍖呰瀹瑰櫒鍚嶇О', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMouldType', title: '鍖呰瀹瑰櫒鍒嗙被', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMouldPurpose', title: '鍖呰瀹瑰櫒鐢ㄩ��', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMouldLength', title: '鍖呰瀹瑰櫒闀垮害', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMouldWidth', title: '鍖呰瀹瑰櫒瀹藉害', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMouldHeight', title: '鍖呰瀹瑰櫒楂樺害', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMouldFoldHeight', title: '鎶樺彔楂樺害', style: 'background-color: #f9f9f9;' }
+ , { field: 'HSNP', title: '瀹瑰櫒鍖呰浜у搧鏁伴噺', edit: 'text', totalRow: true }
+ , { field: 'HTransPackFlag', title: '鍛ㄨ浆瀹瑰櫒鏍囪', width: 120, templet: '#HTransPackFlag' }
+ , { field: 'HSendPackFlag', title: '鍙戣揣瀹瑰櫒鏍囪', width: 120, templet: '#HSendPackFlag' }
+ , { field: 'HDefaultTransPackFlag', title: '榛樿鍛ㄨ浆瀹瑰櫒鏍囪', width: 120, templet: '#HDefaultTransPackFlag' }
+ , { field: 'HDefaultSendPackFlag', title: '榛樿鍙戣揣瀹瑰櫒鏍囪', width: 120, templet: '#HDefaultSendPackFlag' }
+ , { field: 'HUseFlag', title: '鍚敤鏍囪', width: 120, templet: '#HUseFlag' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+ option.data = [];
+ table.render(option);
+ }
+ //#endregion
+
+ //#region 缂栬緫 椤甸潰璧嬪��
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "Gy_MaterialPackingRelation/Gy_MaterialPackingRelationEditList",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": linterid, "user": sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ var tableMain = result.data;
+ if (result.code == 1) {
+ //涓昏〃
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInterID": tableMain[0]["HInterID"]
+ , "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
+ , "HDate": tableMain[0]["鏃ユ湡"]
+ , "HCusID": tableMain[0]["HCusID"]
+ , "HCusName": tableMain[0]["瀹㈡埛"]
+ , "HProjectName": tableMain[0]["椤圭洰鍚嶇О"]
+ , "HMaterID": tableMain[0]["HMaterID"]
+ , "HMaterNumber": tableMain[0]["鐗╂枡浠ｇ爜"]
+ , "HMaterName": tableMain[0]["鐗╂枡鍚嶇О"]
+ , "HMaterModel": tableMain[0]["鐗╂枡鍨嬪彿"]
+ , "HRemark": tableMain[0]["澶囨敞"]
+ , "HOrgID": tableMain[0].HOrgID
+ , "HMaker": tableMain[0].鍒涘缓浜�
+ , "HMakeDate": tableMain[0].鍒涘缓鏃堕棿
+ , "HChecker": tableMain[0].瀹℃牳浜�
+ , "HCheckDate": tableMain[0].瀹℃牳鏃堕棿
+ , "HUpDater": tableMain[0].淇敼浜�
+ , "HUpDateDate": tableMain[0].淇敼鏃堕棿
+ , "HCloseMan": tableMain[0].鍏抽棴浜�
+ , "HCloseDate": tableMain[0].鍏抽棴鏃堕棿
+ , "HDeleteMan": tableMain[0].浣滃簾浜�
+ , "HDeleteDate": tableMain[0].浣滃簾鏃堕棿
+ });
+ option.data = result.data;
+ table.render(option);
+
+ setSelectByTableRender(); //鏍规嵁瀛愯〃鍊奸噸鏂版覆鏌撲笅鎷夊垪琛�
+ }
+ }
+ })
+ }
+ //#endregion
+
+ //#region 瀹℃牳 鍙嶅鏍�
+ //瀹℃牳
+ function set_CheckBills(nums) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain',
+ type: "GET",
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+
+ //鍙嶅鏍�
+ function set_AbandonChecks(nums) {
+ layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain',
+ type: "GET",
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ //#endregion
+ });
+ function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ {
+ $("#HCusName").val(obj[0].HName);
+ $("#HCusID").val(obj[0].HItemID);
+ }
+
+ function GetMaterValue(obj) { //鐗╂枡
+ $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(obj[0].瑙勬牸鍨嬪彿);
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/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 49aff68..d206b13 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"
@@ -61,9 +61,9 @@
var Type = params[params[1]];
var OpenTmp = params[params[2]];
-
+
switch (Type) {
-
+
//case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
// //CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
// CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
@@ -221,7 +221,10 @@
case "HProcessExchange"://宸ュ簭娴佽浆鍗�
var ListTrue = value.split('|');
if (ListTrue[1] == 0) {
- CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + ListTrue[0], true, "");
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + ListTrue[0], true, "");
+ } else if (ListTrue[1] == 1) {
+ //鎵撳嵃宸ュ簭娴佽浆鍗″皬鏍囩
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList_Small.aspx?linterid=" + ListTrue[0], true, "");
} else {
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + "_Sub.grf", "xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx?linterid=" + ListTrue[0], true, "");
}
@@ -364,7 +367,7 @@
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_CustTagBarCodeList.aspx?linterid=" + ListTrue[0] + "&entryid=" + ListTrue[1], true, "");
} else {
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_CustTagBarCodeList_Select.aspx?linterid=" + ListTrue[0], true, "");
- }
+ }
break;
case "Kf_BarCodeDetailQuery": //鏉＄爜鏄庣粏
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_BarCodeDetailQuery.aspx?linterid=" + value, true, "");
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx"
new file mode 100644
index 0000000..9a2442a
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_ProcessExchangeBillList_Small.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Sc_ProcessExchangeBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ SqlXMLReportData.GenEntireData(this, "select 鐢熶骇璁㈠崟鍙�,鍗曟嵁鍙�,浜у搧浠ｇ爜,浜у搧鍚嶇О,浜у搧瑙勬牸,娴佽浆鍗℃暟閲�,琛ㄥご澶囨敞 as 宸ヨ壓娴� from h_v_Sc_ProcessExchangeBillQuery where hmainid in("+Request.Params["linterid"] +")","select 1");
+
+
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx.cs"
new file mode 100644
index 0000000..d2634f5
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Sc_ProcessExchangeBillList_Small : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Repair_Excel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Repair_Excel.html"
index 8e68116..187f819 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Repair_Excel.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Repair_Excel.html"
@@ -151,8 +151,8 @@
, { field: 'HOrgID', title: 'HOrgID', width: 120, 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 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
};
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
index f0b3872..c5a3460 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
@@ -40,14 +40,14 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">涓嶈壇鍘熷洜浠ｇ爜锛�</label>
+ <label class="layui-form-label" style="width: 120px">涓嶈壇缂洪櫡浠ｇ爜锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">涓嶈壇鍘熷洜鍚嶇О锛�</label>
+ <label class="layui-form-label" style="width: 120px">涓嶈壇缂洪櫡鍚嶇О锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
@@ -474,9 +474,9 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_IF_Edit_BadReasonList[0];
- $("#HNumber").val(data.涓嶈壇鍘熷洜浠ｇ爜);//浠ｇ爜
+ $("#HNumber").val(data.涓嶈壇缂洪櫡浠ｇ爜);//浠ｇ爜
$("#HItemID").val(OperationType == 2 ? 0 : data.HItemID);//浠ｇ爜ID
- $("#HName").val(data.涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+ $("#HName").val(data.涓嶈壇缂洪櫡鍚嶇О);//鍚嶇О
$("#HHelpCode").val(data.鍔╄浠ｇ爜);//鍔╄浠ｇ爜
$("#HDeptNumber").val(data.閮ㄩ棬浠ｇ爜);//榛樿閮ㄩ棬浠ｇ爜
$("#HDeptName").val(data.閮ㄩ棬鍚嶇О);//榛樿閮ㄩ棬
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutCompareToProductReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutCompareToProductReport.html"
index 991a84b..b5ee283 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutCompareToProductReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutCompareToProductReport.html"
@@ -373,7 +373,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- var totalArray = ["绫虫暟", "閲嶉噺"];
+ var totalArray = ["绫虫暟", "閲嶉噺","浠舵暟"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
diff --git "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html" "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
index 3934570..32cf8a8 100644
--- "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
+++ "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
@@ -82,7 +82,7 @@
</div>
<div id="HBadLabelNameList">
</div>
- <div id="HistogramReport" style = "background-color: black; height: 2000px; width: 100%; display: flex; flex-direction: column; align-items:center;">
+ <div id="HistogramReport" style = "background-color: black; height: 5000px; width: 100%; display: flex; flex-direction: column; align-items:center;">
</div>
</form>
@@ -390,7 +390,11 @@
var HContainerElement_ColIndex = document.createElement('div'); //琛岀储寮曞鍣�
HContainerElement_ColIndex.style = "border: 2px solid black;color:white;";
HContainerElement_ColIndex.className = "layui-inline";
- HContainerElement_ColIndex.innerHTML = data[i]["HPosition_x"];
+ if (data[i]["HPosition_x"] * 1 < 10) {
+ HContainerElement_ColIndex.innerHTML = "0" + data[i]["HPosition_x"];
+ } else {
+ HContainerElement_ColIndex.innerHTML = data[i]["HPosition_x"];
+ }
if (data[i]["HSetNo"] == HSetNo && data[i]["HPosition_x"] != HPosition_x) { //鐩稿悓set瀹瑰櫒涓紝褰撳墠PCS鐨勮绱㈠紩涓庝笂涓�涓狿CS鐨勮绱㈠紩涓嶄竴鑷达紝鍒欐崲琛�
var HBrElement_PCS = document.createElement('br');
HCurrentElement_Set.appendChild(HBrElement_PCS);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
index 7d8dcf0..9f0322e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
@@ -451,7 +451,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HConkTypeName").val(checkStatus.data[0].鏁呴殰绫诲埆);
+ $("#HConkTypeName").val(checkStatus.data[0].鏁呴殰绫诲埆鍚嶇О);
$("#HConkTypeID").val(checkStatus.data[0].hitemid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
index 09c8f32..3f404c1 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
@@ -206,7 +206,7 @@
<tr>
<th>鏂拌璁″鍛�</th>
<td class="bz_td">
- <textarea name="HNewDesignLife" id="HNewDesignLife" placeholder="璇疯緭鍏ユ柊璁捐瀵垮懡" class="layui-textarea"></textarea>
+ <textarea name="HNewDesignLife" id="HNewDesignLife" placeholder="璇疯緭鍏ユ柊璁捐瀵垮懡" class="layui-textarea"></textarea>
</td>
</tr>
<tr>
@@ -889,7 +889,10 @@
layer.msg("鍙戠幇浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
-
+ if ($("#HNewDesignLife").val() == "" || $("#HNewDesignLife").val() == "undefined") {
+ layer.msg("鏂拌璁″鍛戒笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return 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/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 7400c03..75427ba 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"
@@ -134,6 +134,46 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">闀�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldLength" id="HMouldLength">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldWidth" id="HMouldWidth">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;"> 楂� </label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldHeight" id="HMouldHeight">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎶樺彔楂樺害</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldFoldHeight" id="HMouldFoldHeight">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 90px;">
+ <input type="checkbox" name="checkboxHTransPackFlag" id="checkboxHTransPackFlag" lay-skin="primary" lay-filter="checkboxHTransPackFlag" checked title="鏄惁鍛ㄨ浆瀹瑰櫒鏍囪">
+ <input type="hidden" value="true" name="HTransPackFlag" id="HTransPackFlag" lay-verify="HTransPackFlag">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 150px;">
+ <input type="checkbox" name="checkboxHSendPackFlag" id="checkboxHSendPackFlag" lay-skin="primary" lay-filter="checkboxHSendPackFlag" checked title="鏄惁鍙戣揣瀹瑰櫒鏍囪">
+ <input type="hidden" value="true" name="HSendPackFlag" id="HSendPackFlag" lay-verify="HSendPackFlag">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" readonly>
@@ -367,7 +407,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">涓嬫淇濆吇/鏍℃鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HNextMainDate" name="HNextMainDate" id="HNextMainDate">
+ <input type="date" class="layui-input" lay-verify="HNextMainDate" name="HNextMainDate" id="HNextMainDate">
</div>
</div>
<div class="layui-inline" style="margin-left:10px;">
@@ -710,7 +750,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID , 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1074,6 +1114,15 @@
}
});
+ });
+
+ //鏄惁榛樿鍛ㄨ浆瀹瑰櫒鏍囪
+ form.on('checkbox(checkboxHTransPackFlag)', function (data) {
+ $("#HTransPackFlag").val(data.elem.checked);
+ });
+ //鏄惁榛樿鍙戣揣瀹瑰櫒鏍囪
+ form.on('checkbox(checkboxHSendPackFlag)', function (data) {
+ $("#HSendPackFlag").val(data.elem.checked);
});
//榛樿浠撲綅缁�
@@ -1728,12 +1777,26 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
$.ajax({
url: GetWEBURL() + "/Gy_Mould_Edit/xg",
- async:false,
+ async: false,
type: "GET",
data: {
"HInterID": linterid
},
success: function (d) {
+ var IsHTransPackFlag = d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪; //鍒ゆ柇瀹瑰櫒鏄惁琚爣璁�
+ if (IsHTransPackFlag == 1) {
+ $("input[name='checkboxHTransPackFlag']").prop("checked", true);
+ }
+ else {
+ $("input[name='checkboxHTransPackFlag']").prop("checked", false);
+ }
+ var IsHSendPackFlag = d.data[0].鍙戣揣瀹瑰櫒鏍囪;
+ if (IsHSendPackFlag == 1) {
+ $("input[name='checkboxHSendPackFlag']").prop("checked", true);
+ }
+ else {
+ $("input[name='checkboxHSendPackFlag']").prop("checked", false);
+ }
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
var tableSub = d.data;
$("#HInterID").val(d.data[0].hmainid);
@@ -1765,6 +1828,15 @@
$("#HSaveLife").val(d.data[0].瀹夊叏瀵垮懡);
$("#HWHID").val(d.data[0].HWhID);
$("#HWHName").val(d.data[0].榛樿浠撳簱);
+ $("#HMouldLength").val(d.data[0].闀�);
+ $("#HMouldWidth").val(d.data[0].瀹�);
+ $("#HMouldHeight").val(d.data[0].楂�);
+ $("#HMouldFoldHeight").val(d.data[0].鎶樺彔楂樺害);
+ $("#checkboxHTransPackFlag").prop("checked", d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == 1); // 璁剧疆鍛ㄨ浆瀹瑰櫒鏍囪
+ $("#HTransPackFlag").val(d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == 1 ? "true" : "false");
+ $("#checkboxHSendPackFlag").prop("checked", d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1); // 璁剧疆鍙戣揣瀹瑰櫒鏍囪
+ $("#HSendPackFlag").val(d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1 ? "true" : "false";
+ layui.form.render('checkbox'); // 鏇存柊Layui鐨勬樉绀虹姸鎬侊紝鍔ㄦ�佹樉绀哄閫夋鐨勭姸鎬�
//$("#HRoutingID").val(d.data[0].HRoutingID);
//$("#HBomID").val(d.data[0].HBomID);
$("#HVersion").val(d.data[0].鐗堟湰);
@@ -1963,6 +2035,9 @@
}
if (Stverf == "Add") {
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ if (typeof (data.field.HNextMainDate) == "undefined" || data.field.HNextMainDate == "" || data.field.HNextMainDate == null) {
+ data.field.HNextMainDate = Format(new Date(), "yyyy-MM-dd");
+ }
var sMainStr = JSON.stringify(data.field);
//瀛愯〃鏁版嵁搴忓垪鍖�
var sSubStr = JSON.stringify(num);
@@ -2000,6 +2075,9 @@
//淇敼
data.field.HUpDater = sessionStorage["HUserName"];//淇敼浜�
+ if (typeof (data.field.HNextMainDate) == "undefined" || data.field.HNextMainDate == "" || data.field.HNextMainDate == null) {
+ data.field.HNextMainDate = Format(new Date(), "yyyy-MM-dd");
+ }
var sMainStr = JSON.stringify(data.field);
//瀛愯〃鏁版嵁搴忓垪鍖�
var sSubStr = JSON.stringify(num);
@@ -2289,6 +2367,22 @@
layer.msg("鍣ㄥ叿瑙勬牸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (!/^[1-9]\d*$/.test($("#HMouldLength").val())) {
+ layer.msg("闀匡細璇疯緭鍏ュぇ浜庨浂鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+ return Result = false;
+ }
+ if (!/^[1-9]\d*$/.test($("#HMouldWidth").val())) {
+ layer.msg("瀹� 锛氳杈撳叆澶т簬闆剁殑鏁存暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+ return Result = false;
+ }
+ if (!/^[1-9]\d*$/.test($("#HMouldHeight").val())) {
+ layer.msg("楂橈細璇疯緭鍏ュぇ浜庨浂鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+ return Result = false;
+ }
+ if (!/^[1-9]\d*$/.test($("#HMouldFoldHeight").val())) {
+ layer.msg("鎶樺彔楂樺害锛氳杈撳叆澶т簬闆剁殑鏁存暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+ return Result = false;
+ }
if ($("#HMouleTypeID").val() == '' || $("#HMouleTypeID").val() == null) {
layer.msg("鍣ㄥ叿鍒嗙被涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -2326,63 +2420,63 @@
return Result = false;
}
return Result;
- }
+ }
- function GetGyMaterial(obj) { //鐗╂枡
- $("#HName").val(obj.鐗╂枡鍚嶇О);
- $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
- $("#HMaterID").val(obj.HItemID);
- }
+ function GetGyMaterial(obj) { //鐗╂枡
+ $("#HName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterID").val(obj.HItemID);
+ }
- function GetMouldTypeValue(obj) { //鍣ㄥ叿鍒嗙被
- $("#HMouleTypeName").val(obj[0].鍣ㄥ叿鍒嗙被鍚嶇О);
- $("#HMouleTypeID").val(obj[0].HItemID);
- }
+ function GetMouldTypeValue(obj) { //鍣ㄥ叿鍒嗙被
+ $("#HMouleTypeName").val(obj[0].鍣ㄥ叿鍒嗙被鍚嶇О);
+ $("#HMouleTypeID").val(obj[0].HItemID);
+ }
- function GetUnitValue(obj) { //璁￠噺鍗曚綅
- $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
- $("#HUnitID").val(obj[0].HItemID);
- }
+ function GetUnitValue(obj) { //璁￠噺鍗曚綅
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HUnitID").val(obj[0].HItemID);
+ }
- function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
- $("#HDeptID").val(obj[0].HItemID);
- $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
- }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ }
- function GetHSupNameValue(obj) { //杩斿洖渚涘簲鍟�
- $("#HSupID").val(obj[0].HItemID);//渚涘簲鍟唅d
- $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
- }
+ function GetHSupNameValue(obj) { //杩斿洖渚涘簲鍟�
+ $("#HSupID").val(obj[0].HItemID);//渚涘簲鍟唅d
+ $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
+ }
- function GetHWHValue(obj) { //浠撳簱
- $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
- $("#HWHID").val(obj[0].HItemID);
- }
+ function GetHWHValue(obj) { //浠撳簱
+ $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+ $("#HWHID").val(obj[0].HItemID);
+ }
- function GetGyStockPlace(obj) { //浠撲綅
- $("#HSPName").val(obj.浠撲綅鍚嶇О);
- $("#HSPID").val(obj.HMainID);
- }
+ function GetGyStockPlace(obj) { //浠撲綅
+ $("#HSPName").val(obj.浠撲綅鍚嶇О);
+ $("#HSPID").val(obj.HMainID);
+ }
- function GetMouldMaintainRuleValue(obj) { //淇濆吇瑙勭▼
- $("#HMouldMaintainRuleInterName").val(obj[0].鍗曟嵁鍙�);
- $("#HMouldMaintainRuleInterID").val(obj[0].hmainid);
- OptionData = obj[0];
- }
+ function GetMouldMaintainRuleValue(obj) { //淇濆吇瑙勭▼
+ $("#HMouldMaintainRuleInterName").val(obj[0].鍗曟嵁鍙�);
+ $("#HMouldMaintainRuleInterID").val(obj[0].hmainid);
+ OptionData = obj[0];
+ }
- function GetHAccSupNameValue(obj) { //杩斿洖鍒堕�犲巶鍟�
- $("#HMadeSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
- $("#HMadeSupID").val(obj[0].HItemID);
- }
- //瀛愯〃鍣ㄥ叿鍙屽嚮杩斿洖
- function GetMouldFileValue(obj) {
- OptionData = obj[0];
+ function GetHAccSupNameValue(obj) { //杩斿洖鍒堕�犲巶鍟�
+ $("#HMadeSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+ $("#HMadeSupID").val(obj[0].HItemID);
+ }
+ //瀛愯〃鍣ㄥ叿鍙屽嚮杩斿洖
+ function GetMouldFileValue(obj) {
+ OptionData = obj[0];
- HDataEmp = obj[0];
- }
- function GetMouldDotCheckRuleValue(obj) {
- OptionData = obj[0];
- }
+ HDataEmp = obj[0];
+ }
+ function GetMouldDotCheckRuleValue(obj) {
+ OptionData = obj[0];
+ }
</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/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
index e676622..5479b50 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/KF_BarCodeStatusChangeBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
@@ -487,8 +487,8 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HBarCode', title: '鏉″舰鐮�', edit: 'text' }
- , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text', totalRow: true }
- , { field: 'HRelationMoney', title: '鍏宠仈閲戦', edit: 'text', totalRow: true}
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text', totalRow: true, hide: true }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦', edit: 'text', totalRow: true, hide: true }
, { field: 'HBarCodeStatus_Old', title: '鍘熺姸鎬�', templet: "#HBarCodeStatus_Old", hide: true }
, { field: 'HBarCodeStatus_New', title: '鐘舵��', templet: "#HBarCodeStatus_New" }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text' }//f7
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_Add_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_Add_MouldRepairCheckBillList.html"
index 441efc2..99bdf57 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_Add_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_Add_MouldRepairCheckBillList.html"
@@ -1014,6 +1014,10 @@
HRepairCheckID: checkOne.hitemid,
HRepairCheckCode: checkOne.缁翠慨楠屾敹椤圭洰浠ｇ爜,
HRepairCheckName: checkOne.缁翠慨楠屾敹椤圭洰,
+ HManagerID: 0,
+ HManagerCode: "",
+ HManagerName: "",
+ HRemark:""
})
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
index aa21149..e83f1b4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
@@ -1247,7 +1247,7 @@
$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
form.render('select');
- $("#HInitTimeCycle").val("29");
+ $("#HInitTimeCycle").val("3");
}
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index 1373c16..a6da258 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -219,7 +219,7 @@
var sWhere = "";
var option = [];
//#endregion
- var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鍗曟嵁绫诲瀷", "hmainid", "HSupplierID","HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var ins;
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -249,8 +249,7 @@
case 'set_Excel': set_Excel();
break;
//瀵煎嚭excel
- case 'get_export':
- get_Export();
+ case 'get_export':get_Export();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -539,7 +538,6 @@
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
- titleData = [];
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
@@ -901,6 +899,12 @@
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
+ if (itemobj === '鐗╂枡浠ｇ爜') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ if (itemobj === '鐗╂枡鍚嶇О') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
if (itemobj === '瑙勬牸鍨嬪彿') {
item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
index 2c4c20d..5d48e5c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
@@ -198,6 +198,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var titleData = ["hmainid", "HWorkShopID","HMaterID","鍗曟嵁绫诲瀷"];
var ins;
//#endregion
@@ -373,10 +374,58 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: result.data
+ , height: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
+
option.data = result.data;
ins = table.render(option);
layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+
+ //鍒楄缃�
+ DisPlay_HideColumn();
} else {
layer.close(ajaxLoad);
layer.alert(result.code + result.Message, { icon: 5 });
@@ -386,8 +435,6 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- //鍒楄缃�
- DisPlay_HideColumn();
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
index 09f1d20..58e2260 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
@@ -1409,10 +1409,15 @@
if ($("#HMergeDept").val() == "鏄�") {
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
- var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
- } else {
+ var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
+ }else {
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
- var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
+ var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
+ }
+
+ if ($("#HWorkShopID").val() == "15035828") {
+ //鏍规嵁鎺掍骇鏍囪鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹紙閰嶄欢杞﹂棿锛�
+ var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = '閰嶄欢璁㈠崟' and HLockOrder != 1 )";
}
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 98e2dcb..696f919 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -71,7 +71,7 @@
<option value="璁″垝纭">璁″垝纭</option>
<option value="涓嬭揪">涓嬭揪</option>
-
+ <option value="0">鍏ㄩ儴</option>
<option value="瀹屽伐">瀹屽伐</option>
<option value="缁撴">缁撴</option>
</select>
@@ -81,8 +81,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏄惁涓嬫帹鐢熸垚娴佽浆鍗�</label>
<div class="layui-input-block" style="margin-top:10px">
- <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
- <!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
+ <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
<option value="鍏ㄩ儴" selected="selected">鍏ㄩ儴</option>
<option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
<option value="鏈笅鎺�">鏈笅鎺�</option>
@@ -259,26 +258,6 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<div id="page" style="margin-top:70px;"></div>
<script type="text/html" id="toolbarDemo">
- <!--<div class="layui-btn-container">
- <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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></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_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>鏂板(鏃犲垪琛�)</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit_NT"><i class="layui-icon layui-icon-form"></i>缂栬緫(鏃犲垪琛�)</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy_NT"><i class="layui-icon layui-icon-form"></i>澶嶅埗(鏃犲垪琛�)</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Xc"><i class="layui-icon layui-icon-form"></i>涓嬫煡</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
<div class="layui-btn-container" id="HideButtonList">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_BatchSplitPushDown" id="set_BatchSplitPushDown"><i class="layui-icon layui-icon-form"></i>鎵归噺鎷嗗垎涓嬫帹</button>
@@ -288,6 +267,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Resume" id="set_Resume"><i class="layui-icon layui-icon-form"></i>灞ュ巻鏌ヨ</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>澶氳涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dhLsit"><i class="layui-icon layui-icon-form"></i>澶氳涓嬫帹(鍒楄〃)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOChangeBill" id="btn-PushICMOChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductReportBill" id="btn-PushProductReportBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇姹囨姤鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductInBill" id="btn-PushProductInBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇鍏ュ簱鍗�)</button>
@@ -512,6 +492,9 @@
break;
//澶氳涓嬫帹
case 'set_ShowBill_dh': set_ShowBill_dh();
+ break;
+ //澶氳涓嬫帹
+ case 'set_ShowBill_dhLsit': set_ShowBill_dhLsit();
break;
//鎵归噺鎷嗗垎涓嬫帹
case 'set_BatchSplitPushDown': set_BatchSplitPushDown();
@@ -1533,7 +1516,7 @@
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
}
- }
+ }
//鎵归噺鎷嗗垎涓嬫帹娴佽浆鍗�
function set_BatchSplitPushDown() {
@@ -1578,6 +1561,43 @@
}
}
+ //鎵归噺鎷嗗垎涓嬫帹娴佽浆鍗�
+ function set_ShowBill_dhLsit() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length > 0) {
+ var linterid = [];
+ var msg = "";
+ var HErr = "";
+
+ for (var i = 0; i < data.length; i++) {
+ if (Number(data[i].鐢熶骇浠诲姟鍗曟暟閲�) - Number(data[i].娴佽浆鍗℃暟閲�) <= 0) {
+ msg += "閫変腑琛岀<span style='color: red;'>" + (i + 1) + "</span>琛岋紝鐢熶骇璁㈠崟锛�<span style='color: red;'>" + data[i].鍗曟嵁鍙� + "</span>,<br/>璁㈠崟鏁伴噺锛�<span style='color: blue;'>" + data[i].鐢熶骇浠诲姟鍗曟暟閲� + "</span>锛屽凡鐢熸垚娴佽浆鍗℃暟<span style='color: blue;'>" + data[i].娴佽浆鍗℃暟閲� + "</span>,<br/>鍓╀綑鍙笅鎺ㄦ祦杞崱鏁�:<span style='color: orange;'>" + "0</span>锛岃鍕胯秴閲忕敓鎴愶紒" + "<br/>" + "<br/>";
+ }
+ linterid.push(data[i].hmainid + '@' + data[i].hsubid);
+ }
+
+ if (HErr != "") {
+ layer.alert(HErr);
+ return;
+ }
+
+ if (msg != "") {
+ layer.alert(msg);
+ return;
+ }
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_DH.html?OperationType=2&linterid=' + linterid.toString() + '&HSouceBillType=3710'
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
//灞ュ巻鏌ヨ
function set_Resume() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
index 90eb9c8..7419ed9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
@@ -603,7 +603,11 @@
item[itemobj] = "";
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
- item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
}
}
});
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index deceb00..ebbbdd1 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1431,7 +1431,7 @@
// 鍑芥暟锛氬垽鏂暟缁勬槸鍚︿粠灏忓埌澶ф帓搴�
function isSortedAscending(arr) {
for (let i = 0; i < arr.length - 1; i++) {
- if (arr[i] > arr[i + 1]) {
+ if (Number(arr[i]) > Number(arr[i + 1])) {
return false;
}
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 4cbe021..8c676d7 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -1759,6 +1759,16 @@
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (itemobj === '鐗╂枡浠ｇ爜') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ if (itemobj === '鐗╂枡鍚嶇О') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ if (itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
}
}
});
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_OutCompCheckBill.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_OutCompCheckBill.html"
index 4b909c4..e5e94e6 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_OutCompCheckBill.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_OutCompCheckBill.html"
@@ -87,7 +87,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">婧愬崟绫诲瀷</label>
+ <label class="layui-form-label" style="width: 85px;">婧愬崟绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<select name="HMainSourceBillType" id="HMainSourceBillType">
<option value="1401" selected>閿�鍞鍗�</option>
@@ -96,7 +96,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">婧愬崟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;">婧愬崟鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMainSourceBillNo"
id="HMainSourceBillNo"
@@ -209,7 +209,7 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber"
id="HMaterNumber" value=""
@@ -235,7 +235,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HFirstCheckEmpName"
id="HFirstCheckEmpName"
@@ -253,7 +253,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+ style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HQCSchemeName"
id="HQCSchemeName"
@@ -285,7 +285,7 @@
</div>
<div class="layui-inline" id="hidediv1" style="margin-left:20px;">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ style="width: 85px;padding: 9px 18px;">宸ュ簭<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcName" id="HProcName"
style="background-color:#efefef4d;width: 60%;display: inline-block;"
@@ -2434,7 +2434,7 @@
, { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
, { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
, { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
, { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
@@ -3237,12 +3237,14 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
if (UnRightQty > HAcceptQty) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
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.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.html"
index e0dd644..dd37b82 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.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.html"
@@ -55,7 +55,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" value="0">
@@ -79,7 +79,7 @@
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HMainProcNumber" name="HMainProcNumber" id="HMainProcNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input id="HMainProcID" name="HMainProcID" type="hidden" value="0">
@@ -95,7 +95,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
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 a113dc4..8506aba 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"
@@ -38,6 +38,10 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<h1 style="text-align: center; padding: 10px 0;"><b>宸℃鍗�</b></h1>
<div class="layui-tab-content">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">sn鐮佷俊鎭�</li>
+ </ul>
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-row">
@@ -189,6 +193,7 @@
</div>
</div>
</div>
+
</div>
<div class="layui-form-item">
<div class="layui-row" style="display:none">
@@ -219,6 +224,75 @@
</div>
</div>
</div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote1_SN" id="HQCNote1_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN2</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote2_SN" id="HQCNote2_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN3</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote3_SN" id="HQCNote3_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN4</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote4_SN" id="HQCNote4_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN5</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote5_SN" id="HQCNote5_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN6</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote6_SN" id="HQCNote6_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN7</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote7_SN" id="HQCNote7_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN8</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote8_SN" id="HQCNote8_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN9</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote9_SN" id="HQCNote9_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN10</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote10_SN" id="HQCNote10_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+ </div>
</div>
</div>
</div>
@@ -244,12 +318,14 @@
<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="toolbarDemo2">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine_Bad"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine_Bad"><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="xuhao">
@@ -324,6 +400,7 @@
}
var params = getUrlVars();
+
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
@@ -358,6 +435,7 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "7506";
+ var HModName = "MES_QC_PatrolProcCheckDetail_Json";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
@@ -374,30 +452,40 @@
, cols: [[ //琛ㄥご
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: 'HQCNote1_SN', title: '鎶芥SN1', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text', hide: true}
+ , { field: 'HQCNote3_SN', title: '鎶芥SN3', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote4_SN', title: '鎶芥SN4', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote5_SN', title: '鎶芥SN5', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote6_SN', title: '鎶芥SN6', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote7_SN', title: '鎶芥SN7', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote8_SN', title: '鎶芥SN8', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote9_SN', title: '鎶芥SN9', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote10_SN', title: '鎶芥SN10', width: 185, edit: 'text', hide: true }
, { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
, { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
, { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 230 }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
, { field: 'HQCNote1', title: '妫�楠岃褰�1(09:00--11:00)', width: 185, templet: '#HQCNote1' }
- , { field: 'HQCNote1_SN', title: '鎶芥SN1', width: 185, edit: 'text' }
+
, { field: 'HQCNote2', title: '妫�楠岃褰�2(11:00--13:00)', width: 185, templet: '#HQCNote2' }
- , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text' }
+
, { field: 'HQCNote3', title: '妫�楠岃褰�3(13:00--15:00)', width: 185, templet: '#HQCNote3' }
- , { field: 'HQCNote3_SN', title: '鎶芥SN3', width: 185, edit: 'text' }
+
, { field: 'HQCNote4', title: '妫�楠岃褰�4(15:00--17:00)', width: 185, templet: '#HQCNote4' }
- , { field: 'HQCNote4_SN', title: '鎶芥SN4', width: 185, edit: 'text' }
+
, { field: 'HQCNote5', title: '妫�楠岃褰�5(17:00--19:00)', width: 185, templet: '#HQCNote5' }
- , { field: 'HQCNote5_SN', title: '鎶芥SN5', width: 185, edit: 'text' }
+
, { field: 'HQCNote6', title: '妫�楠岃褰�6(18:00--20:00)', edit: 'text', width: 185, hide: true }
- , { field: 'HQCNote6_SN', title: '鎶芥SN6', width: 185, edit: 'text', hide: true }
+
, { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text', hide: true }
- , { field: 'HQCNote7_SN', title: '鎶芥SN7', width: 185, edit: 'text', hide: true }
+
, { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text', hide: true }
- , { field: 'HQCNote8_SN', title: '鎶芥SN8', width: 185, edit: 'text', hide: true }
+
, { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text', hide: true }
- , { field: 'HQCNote9_SN', title: '鎶芥SN9', width: 185, edit: 'text', hide: true }
+
, { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text', hide: true }
- , { field: 'HQCNote10_SN', title: '鎶芥SN10', width: 185, edit: 'text', hide: true }
+
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
]]
@@ -496,11 +584,21 @@
"HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
"HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
"HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].琛ㄤ綋澶囨敞,
- "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7
- , "HQCNote8_SN": data[i].鎶芥SN鐮�8, "HQCNote9_SN": data[i].鎶芥SN鐮�9, "HQCNote10_SN": data[i].鎶芥SN鐮�10
+ /* "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7*/
+ /*, "HQCNote8_SN": data[i].鎶芥SN鐮�8, "HQCNote9_SN": data[i].鎶芥SN鐮�9, "HQCNote10_SN": data[i].鎶芥SN鐮�10*/
});
}
-
+
+ $("#HQCNote1_SN").val(data[0].鎶芥SN鐮�1 || '');
+ $("#HQCNote2_SN").val(data[0].鎶芥SN鐮�2 || '');
+ $("#HQCNote3_SN").val(data[0].鎶芥SN鐮�3 || '');
+ $("#HQCNote4_SN").val(data[0].鎶芥SN鐮�4 || '');
+ $("#HQCNote5_SN").val(data[0].鎶芥SN鐮�5 || '');
+ $("#HQCNote6_SN").val(data[0].鎶芥SN鐮�6 || '');
+ $("#HQCNote7_SN").val(data[0].鎶芥SN鐮�7 || '');
+ $("#HQCNote8_SN").val(data[0].鎶芥SN鐮�8 || '');
+ $("#HQCNote9_SN").val(data[0].鎶芥SN鐮�9 || '');
+ $("#HQCNote10_SN").val(data[0].鎶芥SN鐮�10 || '');
option.data = rowdata;
table.render(option);
for (var i = 0; i < result.data.length; i++) {
@@ -542,7 +640,12 @@
});
}
-
+ // 鍦ㄩ〉闈㈠姞杞藉畬鎴愬悗锛屽鏋滃凡鏈夊瓙琛ㄦ暟鎹紝鍚屾鍒拌〃澶�
+ $(document).ready(function () {
+ setTimeout(function () {
+ syncSubTableToHeader();
+ }, 500);
+ });
//澶村伐鍏锋爮浜嬩欢
var rowid = 0;
var rows = 0;
@@ -551,8 +654,9 @@
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
var NewRow = {
- "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " ", "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
- , "HQCNote8_SN": "", "HQCNote9_SN": "", "HQCNote10_SN": ""};
+ "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
+ , "HQCNote1_SN": $("#HQCNote1_SN").val() || '', "HQCNote2_SN": $("#HQCNote2_SN").val() || '', "HQCNote3_SN": $("#HQCNote3_SN").val() || '', "HQCNote4_SN": $("#HQCNote4_SN").val() || '', "HQCNote5_SN": $("#HQCNote5_SN").val() || '', "HQCNote6_SN": $("#HQCNote6_SN").val() || '', "HQCNote7_SN": $("#HQCNote7_SN").val() || '', "HQCNote8_SN": $("#HQCNote8_SN").val() || '', "HQCNote9_SN": $("#HQCNote9_SN").val() || '', "HQCNote10_SN": $("#HQCNote10_SN").val() || ''
+ };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -578,6 +682,10 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
//layer.alert(copyrow);
}
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
}
});
@@ -1647,9 +1755,43 @@
}
});
})
+ // 鍚屾琛ㄥごSN鐮佸埌瀛愯〃
+ function syncHeaderToSubTable() {
+ var tableData = table.cache['mainTable'];
+ if (tableData && tableData.length > 0) {
+ for (var i = 0; i < tableData.length; i++) {
+ tableData[i].HQCNote1_SN = $("#HQCNote1_SN").val() || '';
+ tableData[i].HQCNote2_SN = $("#HQCNote2_SN").val() || '';
+ tableData[i].HQCNote3_SN = $("#HQCNote3_SN").val() || '';
+ tableData[i].HQCNote4_SN = $("#HQCNote4_SN").val() || '';
+ tableData[i].HQCNote5_SN = $("#HQCNote5_SN").val() || '';
+ }
+ table.reload('mainTable', {
+ data: tableData
+ });
+ }
+ }
+ // 鍚屾瀛愯〃SN鐮佸埌琛ㄥご
+ function syncSubTableToHeader() {
+ var tableData = table.cache['mainTable'];
+ if (tableData && tableData.length > 0) {
+ var firstRow = tableData[0];
+ $("#HQCNote1_SN").val(firstRow.HQCNote1_SN || '');
+ $("#HQCNote2_SN").val(firstRow.HQCNote2_SN || '');
+ $("#HQCNote3_SN").val(firstRow.HQCNote3_SN || '');
+ $("#HQCNote4_SN").val(firstRow.HQCNote4_SN || '');
+ $("#HQCNote5_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote6_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote7_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote8_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote9_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote10_SN").val(firstRow.HQCNote5_SN || '');
+ }
+ }
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+ syncHeaderToSubTable();
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sBadStr = JSON.stringify(table.cache['BadReTable']);
@@ -1684,7 +1826,125 @@
layer.alert(sMsg, { icon: 5 });
}
+ //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ 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: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
+ 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 (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;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
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_PatrolProcCheckOtherill.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_PatrolProcCheckOtherill.html"
index 6a2e715..e9d0043 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_PatrolProcCheckOtherill.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_PatrolProcCheckOtherill.html"
@@ -2121,7 +2121,7 @@
{
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+ "HInspectVal": '', "HTargetVal": + data[i].鐩爣鍊�, "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁� == null ? 0 : data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁� == null ? 0 : data[i].鎷掔粷鏁�,
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
@@ -2655,8 +2655,8 @@
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
- , { field: 'HTargetVal', title: '鐩爣鍊�' }
, { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
+ , { field: 'HTargetVal', title: '鐩爣鍊�' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index f0fbfc9..9370aea 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -78,7 +78,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HSourceID" id="HSourceID" value="0">
@@ -100,7 +100,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -136,7 +136,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
@@ -152,7 +152,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
@@ -163,7 +163,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -188,7 +188,7 @@
</div>
</div>
<div class="layui-inline" id="hidediv1">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HProcID" id="HProcID" value="0">
@@ -2752,7 +2752,7 @@
, { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
, { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
, { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
, { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
@@ -3962,12 +3962,14 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
if (UnRightQty > HAcceptQty) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
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_Add_Edit_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_Add_Edit_POStockInCheckBillList.html"
index 6eb1dc1..e74d451 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_Add_Edit_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_Add_Edit_POStockInCheckBillList.html"
@@ -103,7 +103,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">婧愬崟绫诲瀷</label>
+ <label class="layui-form-label" style="width: 85px;">婧愬崟绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<select name="HMainSourceBillType" id="HMainSourceBillType">
<option value="1102" selected>閲囪喘璁㈠崟</option>
@@ -113,7 +113,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">婧愬崟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;">婧愬崟鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMainSourceBillNo"
id="HMainSourceBillNo"
@@ -229,24 +229,24 @@
<label class="layui-form-label" style="width: 85px;">妫�楠孲N</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HRemarkSN" id="HRemarkSN"
- style="display: inline-block;">
+ style="display: inline-block;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber"
- id="HMaterNumber" value=""
- style="background-color:#efefef4d;width: 60%;display: inline-block;"
- readonly>
+ id="HMaterNumber" value=""
+ style="background-color:#efefef4d;width: 60%;display: inline-block;"
+ readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID"
- value="0"
- style="background-color:#efefef4d;width: 60%;display: none;"
- readonly>
+ value="0"
+ style="background-color:#efefef4d;width: 60%;display: none;"
+ readonly>
<button class="layui-btn layuiadmin-btn-order" type="button"
- lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater"
+ style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -255,42 +255,49 @@
<label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName"
- style="background-color:#efefef4d;display: inline-block;" readonly>
+ style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HFirstCheckEmpName"
- id="HFirstCheckEmpName"
- style="background-color:#efefef4d;width: 60%;display: inline-block;"
- readonly>
+ id="HFirstCheckEmpName"
+ style="background-color:#efefef4d;width: 60%;display: inline-block;"
+ readonly>
<input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp"
- value="0">
+ value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
- lay-submit="" lay-filter="btnSearchHFirstCheckEmp"
- id="btnSearchHFirstCheckEmp"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ lay-submit="" lay-filter="btnSearchHFirstCheckEmp"
+ id="btnSearchHFirstCheckEmp"
+ style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+ style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HQCSchemeName"
- id="HQCSchemeName"
- style="background-color:#efefef4d;width: 60%;display: inline-block;"
- readonly>
+ id="HQCSchemeName"
+ style="background-color:#efefef4d;width: 60%;display: inline-block;"
+ readonly>
<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
- lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme"
+ style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏀惰揣鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQty" id="HQty"
+ style="background-color:#efefef4d;" readonly value="0">
</div>
</div>
</div>
@@ -311,7 +318,7 @@
</div>
<div class="layui-inline" id="hidediv1" style="margin-left:20px;">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ style="width: 85px;padding: 9px 18px;">宸ュ簭<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcName" id="HProcName"
style="background-color:#efefef4d;width: 60%;display: inline-block;"
@@ -2475,6 +2482,7 @@
},
success: function (layero, index) {
+ btnSearchCheckSampleScheme
}
});
@@ -2482,6 +2490,8 @@
//琛ㄤ綋淇℃伅鎶芥牱鏂规寮圭獥
form.on('submit(btnSearchCheckSampleScheme)', function () {
+ var nowindex = $("#HEntryID").val()-1;
+ var inspectMethod = table.cache["mainTable"][nowindex].HAnalysisMethod;
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -2491,7 +2501,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.html?', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -2558,7 +2568,7 @@
//#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
function get_CheckItem() {
- var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+ var HBatchQty = $("#HQty").val() == 0 ? $("#HICMOQty").val() : $("#HQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
@@ -2582,6 +2592,7 @@
"HInspectMethodID": data[i]["HInspectMethodID"], "HInspectMethodName": data[i]["妫�楠屾柟娉�"], "HInspectBasisID": data[i]["HInspectBasisID"], "HInspectBasisName": data[i]["妫�楠屼緷鎹�"],
}
);
+
SampleNum.push(data[0].鏍锋湰閲�);
}
@@ -3149,7 +3160,7 @@
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: "HQualityStdID" },
, { field: 'HInspectMethodID', title: 'HInspectMethodID', edit: 'text', hide: true },
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: "HInspectMethodID" },
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: "HInspectMethodID", style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;'},
, { field: 'HInspectBasisID', title: 'HInspectBasisID', edit: 'text', hide: true },
, { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: "HInspectBasisID" },
@@ -4317,12 +4328,14 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
if (UnRightQty > HAcceptQty) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
@@ -4934,6 +4947,7 @@
$("#HMainSourceEntryID").val(res.data[0].HEntryID)
$("#HQCSchemeName").val(res.data[0].妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(res.data[0].妫�楠屾柟妗圛D);
+ $("#HQty").val(res.data[0].瀹炴敹鏁伴噺);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index acd95d8..13a398c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -274,6 +274,8 @@
<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="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><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>
@@ -319,7 +321,7 @@
<select name="HCompareSymbol" lay-filter="HCompareSymbol" id="HCompareSymbol{{d.LAY_TABLE_INDEX+1}}">
<option value="1" selected="selected">=</option>
<option value="2">></option>
- <option value="3=">>=</option>
+ <option value="3">>=</option>
<option value="4"><</option>
<option value="5"><=</option>
<option value="6"><></option>
@@ -457,6 +459,14 @@
break;
//鍒楄缃�
case 'set_HideColumn':get_HideColumn();
+ break;
+ //涓婁竴琛�
+ case 'btn_up':
+ btn_up();
+ break;
+ //涓嬩竴琛�
+ case 'btn_under':
+ btn_under();
break;
}
});
@@ -1157,7 +1167,7 @@
, { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
, { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
, { field: 'HInspectInstruMentID', title: '妫�楠屼华鍣↖D', edit: 'text', hide: true }
, { field: 'HInspectInstruMentName', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentName' }
, { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
@@ -1599,7 +1609,66 @@
form.render('checkbox');
}
}
+ //#region 瀛愯〃1 涓婄Щ
+ function btn_up() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == 0) {
+ layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+ return;
+ }
+ tables.push(option.data[i - 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i - 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ CheckedSet_tableSub();
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
+ //#region 瀛愯〃1 涓嬬Щ
+ function btn_under() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == option.data.length - 1) {
+ layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+ return;
+ }
+
+ tables.push(option.data[i + 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i + 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ CheckedSet_tableSub();
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
//琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 0edbb7d..79f5fd5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -59,6 +59,13 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMatrerNumber" id="HMatrerNumber" style="width:190px;">
+ <input type="hidden" class="layui-input ForFilteringSchemes" name="HMatrerID" id="HMatrerID" style="width:190px;">
+ </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>
@@ -565,6 +572,8 @@
var HProject = $("#HProject").val();//椤圭洰鍙�
var HQCCheckProjectName = $("#HQCCheckProjectName").val();
var HOrgID = $("#HOrgID").val(); //缁勭粐
+ var HMatrerNumber = $("#HMatrerNumber").val(); //鐗╂枡
+ var HMatrerID = $("#HMatrerID").val(); //鐗╂枡
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -661,6 +670,9 @@
sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
sWhere += " and 宸ュ簭鍚嶇О = '" + HProcName + "'";
}
+ if (HMatrerNumber != "") {
+ sWhere += " and 鐗╂枡浠ｇ爜 ='" + HMatrerNumber + "'";
+ }
addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -671,6 +683,7 @@
function set_ClearQuery() {
$("#HBillNo").val("");
$("#HProject").val("");
+ $("#HMatrerNumber").val("");
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
$("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html"
index d76b106..1d815fe 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html"
@@ -150,6 +150,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <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_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
@@ -394,7 +395,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, totalRow: true
//, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index b4ff437..b0d34c4 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -40,6 +40,7 @@
margin-left: -15px;
margin-right: -15px;
}
+
</style>
</head>
<body>
@@ -59,7 +60,7 @@
<!-- 鏍囬锛屼娇鐢ㄧ粷瀵瑰畾浣嶄娇鍏跺湪鐖跺鍣ㄥ唴灞呬腑 -->
<h1 style="position: absolute; left: 50%; transform: translateX(-50%); z-index: 0; text-align: center; width: fit-content; margin: 0; padding: 0 10px;"><b>棣栦欢妫�楠屽崟</b></h1>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -83,7 +84,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -105,7 +106,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -122,7 +123,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
@@ -138,7 +139,7 @@
</div>
</div>
<div class="layui-inline" id="hidediv2">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -174,7 +175,8 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
+
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
@@ -184,7 +186,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
@@ -194,7 +196,7 @@
</div>
</div>
- </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎵瑰彿</label>
@@ -708,7 +710,7 @@
var rowdata = [];
var option = [];
var HDeptID = "";//閮ㄩ棬id 鑾峰彇鐝
- var HCenterID = "";//宸ヤ綔涓績id 鑾峰彇鐝
+ var HCenterID = "";//宸ヤ綔涓績id 鑾峰彇鐝
var rowdata_Value = [];
var option_Value = [];
@@ -815,12 +817,11 @@
//瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
- (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
- {
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
//鑷姩甯﹀嚭妫�楠屾柟妗�
GetCheckItemID();
}
-
+
}
//宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3790) {
@@ -1102,7 +1103,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩唬鐮�": "","妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩唬鐮�": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -1151,7 +1152,7 @@
//#endregion
//閫�鍑烘寜閽�
- form.on('submit(btn-Exit)', function (data) {
+ form.on('submit(btn-Exit)', function (data) {
sWhere = " and hmainid = " + $("#HInterID").val();
$.ajax({
url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
@@ -1338,7 +1339,7 @@
, 妫�楠岄」鐩唬鐮�: checkStatus.data[0].浠ｇ爜
, HQCCheckItemID: checkStatus.data[0].HItemID
, HResult: HResult
- });
+ });
$('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
form.render('select');
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1353,14 +1354,15 @@
}
}
//灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
- for (var i = 0; i < checkStatus.data.length; i++) {
+ for (var i = 0; i < checkStatus.data.length; i++) {
buttonArr.push({
"妫�楠岄」鐩�": checkStatus.data[i].鍚嶇О, "妫�楠岄」鐩唬鐮�": checkStatus.data[i].浠ｇ爜, "HQCCheckItemID": checkStatus.data[i].HItemID, "HResult": 1,
"HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""});
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ });
}
table.reload("mainTable", {
@@ -1378,7 +1380,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
-
+
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1392,7 +1394,7 @@
妫�楠岄」鐩唬鐮�: OptionData[0].浠ｇ爜,
HQCCheckItemID: OptionData[0].HItemID,
HResult: 1
- });
+ });
$('#HResult' + rowIndex + '').find("option[value='" + 1 + "']").attr("selected", true);
form.render('select');
OptionData = [];
@@ -1439,8 +1441,8 @@
obj.update({
妫�楠屼华鍣ㄤ唬鐮�: OptionData[0].妫�楠屼华鍣ㄤ唬鐮�,
妫�楠屼华鍣�: OptionData[0].妫�楠屼华鍣ㄥ悕绉�,
- HInspectInstruMentID: OptionData[0].HItemID
- });
+ HInspectInstruMentID: OptionData[0].HItemID
+ });
OptionData = [];
}
}
@@ -1710,12 +1712,23 @@
//#endregion
//淇濆瓨
- function set_SaveBill(data) {
+ async function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
//Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
- set_SaveValue($("#HEntryID").val());
+ try {
+ var rownum = $("#HEntryID").val();
+
+ rowFun = table.cache["mainTable"][rownum].HAnalysisMethod;
+ if (rowFun == "")
+ throw error
+ await set_SaveValue($("#HEntryID").val(), rowFun);
+ } catch (error) {
+
+ layer.msg('鐢ㄦ埛鍙栨秷浜嗘楠屽�间繚瀛�');
+ return;
+ }
if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1776,12 +1789,12 @@
data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
- if (data.count == 1) {
+ if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
$('#set_CheckBill').removeClass("layui-btn-disabled").removeAttr("disabled").addClass("layui-btn-normal");
- if (isOpenBox=="1") {
+ if (isOpenBox == "1") {
layer.open({
type: 2,
skin: 'layui-layer-rim',
@@ -1920,8 +1933,8 @@
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
"HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
- "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
- "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�, "HCompareSymbol": data[i].姣旇緝绗�, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].璐ㄩ噺鏍囧噯, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].妫�楠屼緷鎹�,"HCompareSymbol":data[i].姣旇緝绗�
+ "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
+ "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�, "HCompareSymbol": data[i].姣旇緝绗�, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].璐ㄩ噺鏍囧噯, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].妫�楠屼緷鎹�, "HCompareSymbol": data[i].姣旇緝绗�
}
)
@@ -2029,7 +2042,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID +'&HType=SIP'
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID + '&HType=SIP'
, resize: false,
end: function () {
}
@@ -2037,7 +2050,7 @@
}
})
}
-
+
});
//#region 銆愯〃浣撴斁澶ч暅銆�
@@ -2348,7 +2361,7 @@
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ $("#HEntryID").val() - 1
//鎼哄甫鍑烘娊鏍锋柟妗�
ReturnSampleScheme(data);
@@ -2376,7 +2389,7 @@
$("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
//姣旇緝绗�
$("#HComparator").val(data[data.length - 1].姣旇緝绗�);
-
+
if ($("#HEntryID").val() - 1 >= 0) {
option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].HSampleSchemeID;
@@ -2801,7 +2814,7 @@
, { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
, { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
, { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
, { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
, { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
@@ -2812,7 +2825,7 @@
, { field: 'HTargetVal', title: '鐩爣鍊�' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
- , { field: 'HCompareSymbol', title: '姣旇緝绗�'}
+ , { field: 'HCompareSymbol', title: '姣旇緝绗�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
, { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
, { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
@@ -3107,6 +3120,9 @@
//#region 銆愬弻鍑绘楠岄」鐩浜嬩欢銆�
table.on('rowDouble(mainTable)', function (obj) {
+
+
+
$("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
@@ -3117,6 +3133,11 @@
var nowindex = $(obj.tr).attr("data-index");
editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
+ //#region
+
+ //#endregion
+
+
if (option_Check.length > 0) {
$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
@@ -3127,7 +3148,7 @@
$("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
$("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
$("#HComparator").val(option_Check[nowindex].姣旇緝绗�)
- }
+ }
//閫変腑琛屾敼鍙橀鑹�
@@ -3136,14 +3157,15 @@
var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
//鎶婃楠屽�兼暟鎹瓨鍒版暟缁�
//createArr(rowIndex);
-
+ var rowFun = table.cache["mainTable"][nowindex].HAnalysisMethod;
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
+
var table_value = table.cache['ValueTable'];
if (OperationType == 3) {
- set_SaveValue(Number(nowindex) + Number(1));
+ set_SaveValue(Number(nowindex) + Number(1), rowFun);
} else {
- set_SaveValue(dataindex + 1);
+ set_SaveValue(dataindex + 1, rowFun);
}
//璧嬪�间笌鍥炴樉
if ($("#HSampleSchemeID").val() != "0") {
@@ -3571,7 +3593,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- //HCompareSymbol: $("#HCompareSymbol").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: $("#HUnitID").val(), //鍗曚綅ID
HUnit: $("#HUnit").val(), //鍗曚綅
HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
@@ -3649,7 +3671,7 @@
$("#HSampleSchemeID").val(0);
$("#HSampleSchemeName").val("");
- //HCompareSymbol: $("#HCompareSymbol").val();
+ //HCompareSymbol: $("#HCompareSymbol").val();
$("#HUnitID").val(0);
$("#HUnit").val("");
$("#HInspectVal").val("");
@@ -3697,7 +3719,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
- //HCompareSymbol: $("#HCompareSymbol").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnit: option.data[nowindex].HUnit,//鍗曚綅
HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
@@ -3859,8 +3881,8 @@
$("#HUnitID").val(maindata[nowindex].HUnitID);
$("#HUnit").val(maindata[nowindex].HUnit);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal );
- $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit );
+ $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal);
+ $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit);
$("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit);
$("#HComparator").val(maindata[nowindex].HCompareSymbol == "" ? (option_Check.length > 0 ? option_Check[nowindex].姣旇緝绗� : "=") : maindata[nowindex].HCompareSymbol);
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3949,20 +3971,20 @@
var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
//var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val() - 1;
if (UnRightQty > HAcceptQty) {
- $("#HResult" + (Number(HEntryID) )).val(2); //涓嶅悎鏍�
+ $("#HResult" + (Number(HEntryID))).val(2); //涓嶅悎鏍�
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
- $("#HResult" + (Number(HEntryID) )).val(1); //鍚堟牸
+ $("#HResult" + (Number(HEntryID))).val(1); //鍚堟牸
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
}
- form.render('select');
+ form.render('select');
} else {
option_Value.data = [{
"HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
@@ -3993,14 +4015,16 @@
$("#HSampleUnRightQty2").val(UnRightQty);
var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
- if (UnRightQty > HAcceptQty) {
+ if (UnRightQty > HAcceptQty) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
@@ -4209,51 +4233,148 @@
form.render('select');
}
+ //淇濆瓨鎸夐挳
+ form.on('submit(btnSave)', function (data) {
+ set_SaveBill(data);
+ });
+ //妫�楠屽�间繚瀛� - 杩斿洖Promise
+ function set_SaveValue(dataindex, rowFun) {
+ return new Promise((resolve, reject) => {
+ var hasEmptyRow = false;
+ var emptyRowNumbers = [];
- //妫�楠屽�间繚瀛�
- function set_SaveValue(dataindex) {
- if (OperationType == 3) {
- EchoValue();
- }
- for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
- table.cache['ValueTable'][i].HInSpectValueB = 0
+ for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ var row = table.cache['ValueTable'][i];
+ if (rowFun == 2) {
+ if (
+ (!row.HInSpectValue || row.HInSpectValue === "")) {
+ hasEmptyRow = true;
+ emptyRowNumbers.push(i + 1);
+ }
+ }
}
- if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
- table.cache['ValueTable'][i].HInSpectValueT = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
- table.cache['ValueTable'][i].HInSpectValue = 0
- }
- }
- var sValueTable = JSON.stringify(table.cache['ValueTable']);
- var HInterID = $("#HInterID").val();
- var HEntryID = dataindex;
- var msg = sValueTable + ";" + HInterID + ";" + HEntryID
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
- async: true,
- data: { "msg": msg },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
+
+ if (hasEmptyRow) {
+ var confirmMsg = "妫�楠屽�艰〃鏍间腑瀛樺湪绌鸿锛堢 " + emptyRowNumbers.join(", ") + " 琛岋級锛屾槸鍚︾户缁繚瀛橈紵";
+ layer.confirm(confirmMsg, {
+ icon: 3,
+ title: '鎻愮ず',
+ btn: ['纭淇濆瓨', '鍙栨秷淇濆瓨']
+ }, function (index) {
+
layer.close(index);
- //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
- }
- else {
+ proceedWithSave(dataindex).then(resolve).catch(reject);
+ }, function (index) {
+ ////鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+ //var dataindex = $("#HEntryID").val() - 1;
layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //EchoValue();
+ layer.msg('宸插彇娑堜繚瀛橈紝璇峰畬鍠勬暟鎹悗閲嶆柊鎿嶄綔', { icon: 2 });
+ //reject(new Error('鐢ㄦ埛鍙栨秷浜嗕繚瀛�'));
+ });
+ } else {
+
+ proceedWithSave(dataindex).then(resolve).catch(reject);
}
});
}
+
+
+ function proceedWithSave(dataindex) {
+ return new Promise((resolve, reject) => {
+ if (OperationType == 3) {
+ EchoValue();
+ }
+
+
+ for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+ table.cache['ValueTable'][i].HInSpectValueB = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+ table.cache['ValueTable'][i].HInSpectValueT = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+ table.cache['ValueTable'][i].HInSpectValue = 0
+ }
+ }
+
+ var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ var HInterID = $("#HInterID").val();
+ var HEntryID = dataindex;
+ var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+ async: true,
+ data: { "msg": msg },
+ dataType: "json",
+ success: function (data) {
+ layer.close(index);
+ if (data.count == 1) {
+ layer.msg('妫�楠屽�间繚瀛樻垚鍔�', { icon: 1 });
+ resolve(); // 鎴愬姛鏃秗esolve
+ } else {
+ layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + data.Message));
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + err));
+ }
+ });
+ });
+ }
+ //妫�楠屽�间繚瀛�
+ //function set_SaveValue(dataindex) {
+ // if (OperationType == 3) {
+ // EchoValue();
+ // }
+ // for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ // if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+ // table.cache['ValueTable'][i].HInSpectValueB = 0
+ // }
+ // if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+ // table.cache['ValueTable'][i].HInSpectValueT = 0
+ // }
+ // if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+ // table.cache['ValueTable'][i].HInSpectValue = 0
+ // }
+ // }
+
+ // var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ // var HInterID = $("#HInterID").val();
+ // var HEntryID = dataindex;
+ // var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+ // var index = layer.load();
+ // $.ajax({
+ // type: "POST",
+ // url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+ // async: false,
+ // data: { "msg": msg },
+ // dataType: "json",
+ // success: function (data) {
+ // if (data.count == 1) {
+ // layer.close(index);
+ // //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ // }
+ // else {
+ // layer.close(index);
+ // layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // },
+ // error: function (err) {
+ // layer.close(index);
+ // layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // });
+ //}
//鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
function get_ICMOBillStatusList() {
@@ -4518,7 +4639,7 @@
url: GetWEBURL() + "/Web/GetCheckItemID",
type: "GET",
async: false,
- data: { "HName": HName, "HProName": HProName,"HSourceID": HSourceID },
+ data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
success: function (result) {
if (result.code == 1) {
$("#HQCSchemeID").val(result.data[0].hmainid);
@@ -4571,7 +4692,7 @@
var LoadData = data.data;
$("#HShiftsID").val(LoadData[0].HInterID); //褰撳墠宸ュ簭ID
$("#HShiftsName").val(LoadData[0].鐝); //褰撳墠宸ュ簭
- }
+ }
},
error: function (err) {
layer.alert(err, { icon: 5 });
@@ -4655,7 +4776,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HQCCheckItemID","HInspectInstruMentID"];
+ var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
dataCol = data1.data[0].HGridString.split(',');
@@ -4677,7 +4798,7 @@
option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
} else {
option.cols[0][i + 1]["style"] += "font-size:100%";
- }
+ }
//鏄剧ず鍒�
if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
option.cols[0][i + 1]["hide"] = false;
@@ -4776,9 +4897,9 @@
$("#HShiftsID").val(obj[0].HInterID);
}
//宸ュ簭
- function GetProcessValue (obj) {
+ function GetProcessValue(obj) {
$("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
- $("#HProcID").val(obj[0].HItemID);
+ $("#HProcID").val(obj[0].HItemID);
}
//璁￠噺鍗曚綅
function GetHUnitListValue(obj) {
@@ -4798,7 +4919,7 @@
$("#HDownLimit").val(obj.妫�娴嬪�煎悕绉�);
}
//妫�楠岄」鐩�
- function GetCheckItemValue (obj) {
+ function GetCheckItemValue(obj) {
OptionData = obj;
}
//妫�楠屼华鍣�
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 08cb73c..e016948 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"
@@ -506,10 +506,10 @@
sWhere += " and DSN like '%" + HBarcode_SN + "%'";
}
if (HBarcode_ZB) {
- sWhere += " and 鏍堟澘鐮� like '%" + HBarcode_ZB + "%'";
+ sWhere += "and 绠″埗搴忓彿 like 'P%' and 绠″埗搴忓彿 like '%XXX' and 绠″埗搴忓彿='" + HBarcode_ZB+"'";
}
if (HBarcode_ZX) {
- sWhere += " and 涓鐮� like '%" + HBarcode_ZX + "%'";
+ sWhere += "and 绠″埗搴忓彿 like 'MZXH%' and 绠″埗搴忓彿='" + HBarcode_ZX+"'";
}
get_Display(sWhere);
@@ -533,7 +533,8 @@
$("#ColName2").val("0");
$("#Comparator2").val("0");
form.render('select');
-
+
+ get_FastQuery("")
sWhere = "";
}
//#endregion
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_checkPackage.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_checkPackage.html"
new file mode 100644
index 0000000..8190f4b
--- /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_ProcessItemStationPlatform_checkPackage.html"
@@ -0,0 +1,1117 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>宸ュ簭鍗曞搧杩囩珯骞冲彴(鏍￠獙鍖呰)</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <!--<script src="../../../layuiadmin/PubCustom.js"></script>-->
+ <script src="../../CreateControl.js"></script>
+ <script src="../../../layuiadmin/MESLanguage.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px;">
+ <h1 style="text-align: center; padding: 10px 0;"><b>鍖呰鏍￠獙杩囩珯骞冲彴</b></h1>
+ </div>
+ <div class="layui-tab" style="width: 100%; float: left; background-color:white;">
+ <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;">
+ </div>
+ <button class="layui-btn layui-btn-normal" style="float:left;" type="button" lay-submit="" lay-filter="btnNextProc" id="btnNextProc">鎹骇鍝�</button>
+
+ <button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
+
+
+
+ </div>
+
+
+ </div>
+ <div class="layui-tab layui-tab-card" style="width: 49%; float: left; background-color: white;height:400px">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">浜у搧淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content" style="">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ <div class="layui-row">
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="">鎵规鐮佷俊鎭�:</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBarCode_BatchSec" lay-verify="HBarCode_BatchSec" id="HBarCode_BatchSec" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="">褰撳墠鎵规:</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBatchNo" lay-verify="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="">渚涘簲鍟�:</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HSupID" name="HSupID" id="HSupID">
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="">褰撳墠闀洉鐮�:</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HSNNo" lay-verify="HSNNo" id="HSNNo" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">杩芥函鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
+ <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
+ <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="BT_HICMOBillNo">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <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>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;" id="BT_HProcName">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="BT_HMaterNumber">浜у搧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="BT_HMaterName">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="BT_HMaterModel">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HDeptName">褰撳墠杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;" id="BT_HEmpName">鎿嶄綔鍛�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HGroupName">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupName" id="HGroupName" lay-verify="HGroupName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HSourceName">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+
+ </div>
+ <div class="layui-row">
+
+ </div>
+ <div class="layui-row">
+
+
+ </div>
+ </div>
+ </div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab layui-tab-card" style="width: 50.5%; float: right;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍖呰閰嶄欢娓呭崟</li>
+ </ul>
+ <div class="layui-tab-content" style="background-color: white;">
+ <div class="layui-input-block" style="display: inline-block; margin-left:0px;">
+ <label class="layui-form-label" style="padding-left:0px" id="">閰嶄欢鐮�:</label>
+ <input type="text" class="layui-input" name="HBarCode_Key" lay-verify="HBarCode_Key" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_Key" style="width: 500px;float:left">
+
+ </div>
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-card" style="float:left;width:100%">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍘嗗彶杩囩珯娓呭崟</li>
+ </ul>
+ <label class="layui-form-label" style="color: red; font-size: 24px; width:auto;position:absolute;left:300px;margin-top:-40px" id="HReturnMessage">鎴愬姛鎵爜:</label>
+ <div class="layui-tab-content" style="background-color: white;">
+
+ <div class="layui-tab-item layui-show">
+ <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-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><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="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+
+ //瀹氫箟鍏ㄥ眬鍙橀噺
+
+ var HModName = "Cj_ProcessItemStationPlatform_checkPackage";
+ var HModName2 = "Cj_ProcessItemStationPlatform_checkPackage2";
+ var option = [];
+ var option2 = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ var params = get_UrlVars();
+ set_ClearBill();
+
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒犻櫎鎸夐挳
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
+ break;
+ };
+ });
+ table.on('toolbar(mainTable2)', function (obj) {
+ switch (obj.event) {
+ //鍒犻櫎鎸夐挳
+ case 'btn-Delete2': btn_Delete();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
+ break;
+ //鍒锋柊
+ case 'refresh': get_Display();
+ break;
+ };
+ });
+ //闀洉鐮佸洖杞︽柟娉�
+ $('#HBarCode_SN').on('keydown', function (event) {
+ var HBarCode_SN = $('#HBarCode_SN').val();
+ if (event.keyCode == 13) {
+
+ if (HBarCode_SN) {
+ createBillNo();
+ txtHBarCodeSN_KeyDown(HBarCode_SN);
+ }
+
+ }
+ });
+ //鍏抽敭浠跺洖杞︽柟娉�
+ $('#HBarCode_Key').on('keydown', function (event) {
+ var HBarCode_Key = $('#HBarCode_Key').val();
+ if (event.keyCode == 13) {
+
+ if (HBarCode_Key) {
+ txtHBarCodeKey_KeyDown(HBarCode_Key);
+ }
+
+ }
+ });
+
+ //閫夋嫨鎿嶄綔鍛�
+ form.on('submit(btnHEmp)', function () {
+ btnHEmp();
+ });
+
+
+ //閫夋嫨鐢熶骇璧勬簮
+ form.on('submit(btnHSource)', function () {
+ btnHSource();
+ });
+
+ //閫夋嫨鐢熶骇鐝粍鎸夐挳
+ form.on('submit(btnHGroup)', function () {
+ btnHGroup();
+ });
+
+ //閫夋嫨鐢熶骇杞﹂棿鎸夐挳
+ form.on('submit(btnHDept)', function () {
+ btnHDept();
+ });
+
+ //閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnHProc)', function () {
+ btnHProc();
+ });
+ //鎹骇鍝�
+ form.on('submit(btnNextProc)', function (data) {
+ //for (var i = 0; i < option.data.length; i++) {
+ // if (option.data[i].HBindingQty < 1 || option.data[i].HBarCode == "") {
+ // layer.alert("绗�<span style='color: red;'>" + (i + 1) + "</span>琛岋紝閰嶄欢 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> 鏈粦瀹氶綈鏁达紒")
+ // return;
+ // }
+ //}
+
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+
+ //鍘嗗彶缁戝畾璁板綍鏌ヨ
+ //get_Display();
+ });
+
+ //閫�鍑�
+ form.on('submit(btnExit)', function (data) {
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
+ });
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
+ $("#HBarCode_SN").focus();
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ GetDefValByUser();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //
+ get_Display();
+ }
+
+ //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ function GetDefValByUser() {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+ type: "GET",
+ async: false,
+ data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+
+ form.val("formData", {
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.鐢熶骇鐝粍鍚嶇О,
+ "HEmpID": data.HEmpID,
+ "HEmpName": data.鎿嶄綔鍛樺悕绉�,
+ "HDeptID": data.HDeptID,
+ "HDeptName": data.閮ㄩ棬鍚嶇О,
+ "HProcNumber": data.宸ュ簭浠ｇ爜,
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcID": data.HProcID
+ });
+ layer.close(index);
+ }
+ , error: function () {
+ layer.close(index);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //鍏抽敭浠舵竻鍗�
+ function set_InitGrid() {
+ option= {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , page: false
+ , totalRow: true
+ , cellMinWidth: 120
+ , data: []
+ , height: 285
+ , limit: 10
+ , cols: [[ //缁戝畾淇℃伅琛�
+ { type: 'numbers', title: '搴忓彿', width: 50 }
+ , { field: 'HBarCode_P', title: '浜у搧鐮�', width: 265 }
+ , { field: 'HBarCode', title: '閰嶄欢鐮�', width: 265 }
+ , { field: 'HPartsQty', title: '閰嶄欢鏁�', width: 72 }
+ , { field: 'HBindingQty', title: '宸茬粦鏁�', width: 72 }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 160, hide: true }
+ , { field: 'HBatchNo', title: '鎵规', width: 160, hide: true }
+ , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
+ , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
+ , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
+ , { field: 'HWorkerID', title: 'HWorkerID', width: 160, hide: true }
+ , { field: 'HScanDate', title: 'HScanDate', width: 160, hide: true }
+ , { field: 'HSourceInterID', title: 'HSourceInterID', width: 160, hide: true }
+ , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 160, hide: true }
+ , { field: 'HSourceBillNo', title: 'HSourceBillNo', width: 160, hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
+ ]]
+ }
+ option2 = {
+ elem: '#mainTable2'
+ , toolbar: '#toolbarDemo2'
+ , page: false
+ , totalRow: true
+ , cellMinWidth: 120
+ , data: []
+ , height: 385
+ , limit: 10
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜' }
+ , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
+ , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
+ , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true }
+ , { field: 'HBatchNo', title: '褰撳墠鎵规' }
+ , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+ , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+ , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
+ , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
+ , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
+ , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: 'HBarCode', title: 'HBarCode', hide: true }
+ ]]
+ }
+ table.render(option);
+ table.render(option2);
+ }
+
+ //浜у搧SN闀洉鐮佺爜鍥炶溅鏌ヨ
+ function txtHBarCodeSN_KeyDown(HBarCode) {
+ //涓昏〃淇℃伅鏌ヨ
+ var indexs = layer.load();
+ //閰嶄欢淇℃伅鏌ヨ
+ var HBillNo = $("#HBillNo").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList_XW",
+ async: false,
+ data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+ var rowarr = [];
+
+ for (var i = 0; i < data.length; i++) {
+ rowarr.push({
+ "HBarCode_P": data[i].浜у搧鐮�, "HPartsBarCode": "", "HPartsQty": data[i].鍒嗗瓙瀛愰」鐢ㄩ噺, "HBindingQty": 0
+ , "HMaterID": data[i].瀛愰」鐗╂枡ID, "HMaterNumber": data[i].瀛愰」鐗╂枡浠ｇ爜, "HMaterName": data[i].瀛愰」鐗╂枡鍚嶇О, "HMaterModel": data[i].瀛愰」瑙勬牸鍨嬪彿, "HBatchNo": ""
+ , "HSourceID": $("#HSourceID").val(), "HEquipID": 0, "HGroupID": $("#HGroupID").val(), "HWorkerID": $("#HEmpID").val()
+ , "HScanDate": new Date(), "HSourceInterID": $("#HICMOInterID").val()
+ , "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val()
+ });
+ }
+
+ option.data = rowarr;
+
+ table.render(option);
+
+
+
+ //绂佺敤杈撳叆妗�,鑳屾櫙鑹插彉鐏�
+ $("#HBarCode_SN").prop("readonly", true);
+ $("#HBarCode_SN").css('background', '#EDEDED')//鑳屾櫙鑹插彉鐏�
+ //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+ $("#HBarCode_Key").focus();
+ //鑾峰彇瀵瑰簲涓昏〃淇℃伅
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
+ async: false,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+ $("#HSNNo").val(HBarCode);
+ $("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
+ $("#HMaterName").val(data1.data[0]["HMaterName"])
+ $("#HMaterModel").val(data1.data[0]["HMaterModel"])
+ $("#HICMOBillNo").val(data1.data[0]["HSourceBillNo"])
+ }
+ else {
+ layer.close(indexs);
+ layer.confirm(data1.Message);
+ }
+
+ },
+ error: function (err) {
+ 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"]) });
+ return;
+ }
+ });
+ }
+ else {
+ layer.close(indexs);
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ layer.confirm(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.close(indexs);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ layer.confirm(data1.Message);
+ }
+ });
+
+ }
+
+ //閰嶄欢鐮佸洖杞︽煡璇�
+ function txtHBarCodeKey_KeyDown(HBarCode) {
+ var indexs = layer.load();
+ var HBillNo = $("#HBillNo").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomMatch_XW",
+ async: false,
+ data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HBarCode_P": $('#HBarCode_SN').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+
+ for (var i = 0; i < option.data.length; i++) {
+ if (data[0].HMaterID == option.data[i].HMaterID && option.data[i].HBindingQty < option.data[i].HPartsQty) {
+ option.data[i].HMaterID = data[0].HMaterID
+ option.data[i].HMaterNumber = data[0].鐗╂枡浠ｇ爜
+ option.data[i].HMaterName = data[0].鐗╂枡鍚嶇О
+ option.data[i].HMaterModel = data[0].瑙勬牸鍨嬪彿
+ option.data[i].HBarCode = data[0].閰嶄欢鐮�
+ option.data[i].HBindingQty = option.data[i].HBindingQty + 1
+ $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓厤浠�:" + data[0].鐗╂枡鍚嶇О);
+ break;
+ } else if (data[0].HMaterID == option.data[i].HMaterID && i == option.data.length - 1) {
+ layer.msg("绗�" + (i + 1) + "琛屽凡鍏ㄩ儴缁戝畾锛岃鍕胯秴閲忕粦瀹�");
+ } else if (data[0].HMaterID != option.data[i].HMaterID && i == option.data.length - 1) {
+ layer.msg("鎵�鎵厤浠剁爜锛�" + HBarCode + " ,瀵瑰簲鐗╂枡涓嶅湪鐢熶骇鐢ㄦ枡娓呭崟涓紒");
+ }
+ }
+
+ //option.data = rowarr;
+
+ table.render(option);
+ //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+ $("#HBarCode_Key").focus();
+ $("#HBarCode_Key").val("");
+ //濡傛灉閰嶄欢閰嶅畬鑷甫鎻愪氦
+ if (areQuantitiesEqual(option.data)) {
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+ }
+ layer.close(indexs);
+ }
+ else {
+ layer.close(indexs);
+ layer.confirm(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.close(indexs);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //鍔犺浇鍘嗗彶杩囩珯娓呭崟淇℃伅
+ function get_Display(sWhere = '') {
+ var ajaxLoad = layer.load();
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var titleData = []
+ 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 });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
+ return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ option2.cols = [col]
+ option2.data = data1.data;
+
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
+
+ table.render(option2);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill() {
+ var data = {
+ "field": {
+ "HProcID": $("#HProcID").val(), "HBatchNo": "",
+ "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+ "HPRDOrgID": sessionStorage["OrganizationID"],
+ "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+ }
+ };
+ var sMainStr = JSON.stringify(data.field);
+ var HBarCode = $("#HBarCode_SN").val();
+ var sSubStr = JSON.stringify(option.data);
+ var sMainSub = sMainStr + ';' + HBarCode + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var indexs = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillAndAssemblyBill",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+
+
+ $("#HReturnMessage").text("鎴愬姛杩囩珯鎵爜涓�涓骇鍝�:" + HBarCode);
+ //鍒囨崲浜у搧
+ set_changeHBarCodeSN();
+ get_Display();
+ }
+ else {
+
+ layer.close(indexs);
+ layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+ }
+
+ },
+ error: function (err) {
+
+ 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"]) });
+ }
+ });
+ }
+ //#endregion
+
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBillandAssemblyBill',
+ type: "GET",
+ data: { "HInterID": data[0].hmainid, "HBarCode_P": data[0].闀洉SN鐮�, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_Display();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+ }
+ }
+
+ //鍒囨崲浜у搧鏂规硶
+ function set_changeHBarCodeSN() {
+ $("#HSNNo").val("");
+ $("#HMaterNumber").val("")
+ $("#HMaterName").val("")
+ $("#HMaterModel").val("")
+ $("#HICMOBillNo").val("")
+
+
+ //鍚敤杈撳叆妗�,鑳屾櫙鑹叉仮澶�
+ $("#HBarCode_SN").prop("readonly", false);
+ $("#HBarCode_SN").css('background', '#FFFFFF')//浜у搧鐮佹枃鏈鑳屾櫙鑹叉仮澶�
+ //娓呯┖鏂囨湰妗嗗唴瀹�
+ $("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
+ //鍏夋爣璺宠浆鍒颁骇鍝佺爜鏂囨湰妗嗕笂
+ $("#HBarCode_SN").focus();
+
+ //娓呴櫎缁戝畾淇℃伅缃戞牸鎵爜璁板綍
+ option.data = [];
+ table.render(option);
+ }
+
+ // 鐢熸垚鍗曟嵁鍙�
+ function createBillNo() {
+ //閲嶆柊鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ //$("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ //$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
+ //閲嶆柊鍚敤淇濆瓨鎸夐挳
+ //$("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ });
+ }
+
+ //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+
+ var wait = layer.load();
+ //鍒犻櫎涓存椂琛ㄦ暟鎹�
+ $.ajax({
+ url: GetWEBURL() + 'Deltet_Sc_AssemblyBill_BindBarCodeTemp',
+ type: "GET",
+ data: { "HBillNo": $("#HBillNo").val(), "HBarCode": option.data[rowIndex].HBarCode, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1, time: 500 }, function () {
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ option.data[rowIndex].HBarCode = "";
+ option.data[rowIndex].HBindingQty = 0;
+ //option.data[rowIndex].HMaterID = 0;
+ option.data[rowIndex].HMaterNumber = "";
+ option.data[rowIndex].HMaterName = "";
+ option.data[rowIndex].HMaterModel = "";
+ option.data[rowIndex].HBarCode = "";
+
+ table.render(option);
+ layer.close(index);
+ });
+ }
+ }
+
+ //鍛樺伐閫夋嫨椤甸潰
+ function btnHEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璐ㄦ鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+
+ //鐢熶骇璧勬簮閫夋嫨椤甸潰
+ function btnHSource() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇鐝粍閫夋嫨椤甸潰
+ function btnHGroup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐝粍琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length != 1) {
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+ }
+ //鑾峰彇鏁版嵁
+ $("#HGroupID").val(checkStatus.data[0].HItemID);//鐝粍id
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇杞﹂棿閫夋嫨椤甸潰
+ function btnHDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length != 1) {
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);//
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //宸ュ簭閫夋嫨椤甸潰
+ function btnHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length != 1) {
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//
+ $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+
+ //闈炵┖楠岃瘉
+ function AllowLoadData() {
+
+ var HBarCode = $("#HBarCode_SN").val();
+ if (HBarCode == "") {
+ layer.msg(get_MessageError("[0000-2-019]浜у搧SN涓嶈兘涓虹┖!", sessionStorage["HTranSlate"]))
+ return false;
+ }
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HBarCode == "" || sSubStr[i].HBarCode == undefined || sSubStr[i].HBarCode == null) {
+ layer.msg("缁戝畾淇℃伅绗�" + (i + 1) + "琛�,閰嶄欢鐮佹湭缁戝畾!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ } else {
+ layer.msg("閰嶄欢缁戝畾淇℃伅涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+
+ //var HBadReasonID = $("#HBadReasonID").val();
+ //if (HBadReasonID == 0) {
+ // layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!")
+ // return false;
+ //}
+ return true;
+ }
+ //鍒ゆ柇鏄惁缁戝畾瀹�
+ function areQuantitiesEqual(arr) {
+ if (arr.length === 0) {
+ return false; // 绌烘暟缁勯粯璁よ涓烘弧瓒虫潯浠�
+ }
+
+ const firstHPartsQty = arr[0].HPartsQty;
+ const firstHBindingQty = arr[0].HBindingQty;
+
+ for (let i = 1; i < arr.length; i++) {
+ if (arr[i].HPartsQty !== firstHPartsQty || arr[i].HBindingQty !== firstHBindingQty) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+ //#endregion
+
+ });
+ function GetHEmpValue(obj) //杩斿洖鑱屽憳
+ {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+
+ }
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#GroupID").val(obj[0].HItemID);
+ }
+ function GetProcessValue(obj) //杩斿洖宸ュ簭
+ {
+ $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//
+ $("#HProcID").val(obj[0].HItemID);
+ }
+ function GetGySource(obj) //杩斿洖鐢熶骇璧勬簮
+ {
+ $("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(obj[0].HItemID);
+ }
+</script>
\ No newline at end of file
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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
index da79faf..6109839 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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
@@ -294,6 +294,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>宸ュ簭妫�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_PatrolCheck" id="set_PatrolCheck"><i class="layui-icon layui-icon-form"></i>宸℃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_WorkCheck" id="set_WorkCheck"><i class="layui-icon layui-icon-form"></i>鑷</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn_print_small" lay-event="btn_print_small"><i class="layui-icon layui-icon-print"></i>宸ヨ壓灏忔爣绛炬墦鍗�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="fy" id="fy"><i class="layui-icon layui-icon-form"></i>缈昏瘧</button>-->
</div>
</script>
@@ -473,6 +474,9 @@
break;
//鎵撳嵃
case 'btn_print': get_print();
+ break;
+ //鎵撳嵃宸ュ簭娴佽浆鍗″皬鏍囩
+ case 'btn_print_small': get_print_small();
break;
//鎵撳嵃
case 'btn_print_pl': get_print_pl();
@@ -936,7 +940,7 @@
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
- sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
+ sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
addSWhereByOpenType();
@@ -3030,6 +3034,7 @@
layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒', sessionStorage["HTranSlate"]));
}
}
+
//鎵撳嵃
function get_print() {
var checkStatus = table.checkStatus('mainTable')
@@ -3056,6 +3061,34 @@
}
}
+
+ //鎵撳嵃宸ュ簭娴佽浆鍗″皬鏍囩
+ function get_print_small() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ var linterid = [];
+
+ for (var i = 0; i < data.length; i++) {
+ linterid.push(data[i].hmainid.toString())
+ }
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + 1 + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒', sessionStorage["HTranSlate"]));
+ }
+ }
+
+
//#region 鎵归噺鎵撳嵃
var time;
var num = 0;
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_ProcessExchangeBill_DH.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_ProcessExchangeBill_DH.html"
new file mode 100644
index 0000000..3619266
--- /dev/null
+++ "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_ProcessExchangeBill_DH.html"
@@ -0,0 +1,834 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>澶氳鐢熶骇璁㈠崟涓嬫帹娴佽浆鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../CreateControl.js"></script>
+ <style>
+ td:has(select) .layui-table-cell {
+ overflow: visible !important;
+ padding: 0;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ /* margin-left: -15px;
+ margin-right: -15px;*/
+ }
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+
+ .layui-table th, .layui-table td {
+ white-space: nowrap; /* 涓嶆崲琛� */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙� */
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_Print" disabled>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:50px !important;">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-BatchSplit">
+ <h1 style="text-align: center; padding: 10px 0;"><b>鐢熶骇璁㈠崟鎵归噺涓嬫帹</b></h1>
+ </div>
+ <div class="layui-tab" lay-filter="tab-BatchSplit">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+
+ var option;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ // 鍒濆鍖栫晫闈�
+ set_InitGrid();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟涓诲瓙id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+
+ }
+ else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+ get_Display_BatchSplit(linterid)
+ }
+ else if (OperationType == 3) {//缂栬緫
+
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+
+ //#endregion
+
+ //#region 澶撮儴宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ data[0].HProQty = 0;
+ data[0].HSheetQty = Number(data[0].HSheetQty) + Number(1);
+
+ switch (obj.event) {
+ case 'btn-CopyLine':
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ //鑾峰彇鏂版祦杞崱鍗曞彿锛屽唴鐮�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum_ProcExchange",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ data[0].HInterID = d.data[0].HInterID;
+ data[0].HBillNo = data[0].HBillNo.substring(0, 13) + '-' + String(Number(data[0].HSheetQty)).padStart(2, '0');
+ }
+ });
+ var copydata = JSON.stringify(data);
+
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ var HArrIndex = -1;
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].HICMOInterID == data[0].HICMOInterID && option.data[i].HICMOEntryID == data[0].HICMOEntryID) {
+ HArrIndex = i;
+ option.data[i].HSheetQty = Number(option.data[i].HSheetQty) + Number(1);
+ }
+ }
+ if (HArrIndex != -1) {
+ option.data.splice(HArrIndex + 1, 0, JSON.parse(copyrow))
+ }
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ form.render('select');
+ }
+ break;
+ }
+ });
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+
+ var data = obj.data; //鑾峰彇褰撳墠琛岀殑鏁版嵁 //灏唎bj.data 瀛楃涓茬被鍨� 璧嬪�肩粰data
+ if (obj.event == 'HDate') { //鍒ゆ柇鎺ュ彈鍒扮殑鏁版嵁瀛楁 id鏄惁涓� Hdata
+ var field = $(this).data('field');//鑾峰彇鏃ユ湡瀛楁
+ laydate.render({
+ elem: this.firstChild //灏嗘棩鏈熼�夋嫨鍣ㄧ粦瀹氬埌瑙﹀彂浜嬩欢鐨勫厓绱犵殑绗竴涓瓙鍏冪礌
+ , show: true //鐩存帴鏄剧ず 鏃ユ湡閫夋嫨鍣紝鑰屼笉鏄瓑寰呯敤鎴风偣鍑�
+ , closeStop: this // 鍒ゆ柇鐐瑰嚮鏃ユ湡閫夋嫨鍣ㄥ閮ㄦ椂鏄惁鍏抽棴
+ , done: function (nowDate) { //褰撴棩鏈熼�夋嫨瀹屾垚鏃舵墽琛岀殑鍥炶皟鍑芥暟
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate; //data瀵硅薄涓殑鏃ユ湡瀛楁
+ obj.update(data); //鏇存柊鍥炶皟鏁版嵁
+ }
+ });
+ }
+ });
+
+ //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ switch (field) {
+ case "HProQty":
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HProQty: value
+ });
+ break;
+ default:
+ }
+ var HICMOQty_useable = data.HUsableQty;//璁㈠崟鍓╀綑鍙敤鏁伴噺
+ var HQty = 0;
+ for (let i = 0; i < option.data.length; i++) {
+ if (option.data[i].HICMOInterID == data.HICMOInterID && option.data[i].HICMOEntryID == data.HICMOEntryID) {
+ HQty = Number(HQty) + Number(option.data[i].HProQty)
+ }
+ }
+ if (HQty > HICMOQty_useable) {
+ layer.alert("鐢熶骇璁㈠崟锛�" + data.HICMOBillNo + ",鏈鐢熸垚娴佽浆鍗℃�绘暟:<span style='color: red;'>" + HQty + "</span>,澶т簬璁㈠崟鍓╀綑鍙敓鎴愭祦杞崱鏁�:<span style='color: blue;'>" + HICMOQty_useable + "</span>锛岃閲嶆柊杈撳叆锛�");
+ obj.update({
+ HProQty: oldText
+ });
+ }
+ table.render(option);
+ });
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(Saver)', function (data) {
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+ });
+
+ //鎵撳嵃
+ form.on('submit(get_Print)', function () {
+ get_Print();
+ })
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
+ })
+ //#endregion
+
+ //#region 椤甸潰鏂规硶
+ //鍒濆鍖栭〉闈�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500
+ , height: 500
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
+ , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 120 }//鐢熶骇璁㈠崟鍙�
+ , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, hide: true }
+ , { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
+ , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵规鍙�', width: 110, edit: 'text', hide: true }
+ , { field: 'HProjectNum', title: '椤圭洰缂栧彿', width: 110, edit: 'text', hide: true }
+ , { field: 'HMateOutBatchNo', title: '鍘熸枡鎵规', width: 110, edit: 'text', hide: true }
+ , { field: 'HMouldNum', title: '妯＄┐鍙�', width: 110, hide: true }
+ , { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text', hide: true }
+ , { field: 'HBatchManager', title: '鍚敤鎵规', width: 110, hide: true }
+ , { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
+ , { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170, edit: 'text', event: "HRoutingName" }
+ , { field: 'HDate', title: '娴佽浆鍗℃棩鏈�', width: 120, event: 'HDate' }
+ , { field: 'HInterID', title: '娴佽浆鍗″唴鐮�', width: 130, hide: true }
+ , { field: 'HBillNo', title: '娴佽浆鍗″彿', width: 170 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
+
+ //鍒濆琛ㄦ牸鏁版嵁
+ var rowdata = [{
+ "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HWorkShopID": 0, "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
+ , "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0, "HLotcardQty": 0
+ , "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
+ , "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HProjectNum": "", "HMateOutBatchNo": "", "HMouldNum": "0#", "HBatchManager": "", "HGroupNumber": ""
+ }];
+
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+ }
+
+ //鎵归噺鎷嗗垎鐢熶骇璁㈠崟鐢熸垚娴佽浆鍗�
+ function get_Display_BatchSplit(linterid) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "Sc_ProcessExchangeBill/Sc_ICMO_DH",
+ type: "GET",
+ data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缃戞牸鏁版嵁璧嬪��
+ var subdata = result.data
+ var rowdata = [];
+ var HInterID = 0;
+ var HBillNo = "";
+ var HSourceInterID = 0;
+ var HSourceEntryID = 0;
+ var k = 01;
+ for (var i = 0; i < subdata.length; i++) {
+
+ //棣栨杩涘叆锛岃幏鍙栨祦杞崱鍗曞彿
+ if (i == 0) {
+ //鑾峰彇娴佽浆鍗″崟鍙凤紝鍐呯爜
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ HInterID = d.data[0].HInterID;
+ HBillNo = d.data[0].HBillNo;
+ }
+ });
+
+ HBillNo = HBillNo + '-' + String(k).padStart(2, '0');
+ HSourceInterID = subdata[i].HICMOInterID;
+ HSourceEntryID = subdata[i].HICMOEntryID;
+ }
+ else if (HSourceInterID == subdata[i].HICMOInterID && HSourceEntryID == subdata[i].HICMOEntryID) {
+ //鑾峰彇娴佽浆鍗″崟鍙凤紝鍐呯爜
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum_ProcExchange",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ HInterID = d.data[0].HInterID;
+ }
+ });
+ HBillNo = HBillNo.substring(0, 13);
+ k = Number(k) + Number(1);
+ HBillNo = HBillNo + '-' + String(k).padStart(2, '0');
+ } else if (HSourceInterID != subdata[i].HICMOInterID || HSourceEntryID != subdata[i].HICMOEntryID) {
+ //鑾峰彇娴佽浆鍗″崟鍙凤紝鍐呯爜
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ HInterID = d.data[0].HInterID;
+ HBillNo = d.data[0].HBillNo;
+ }
+ });
+ HBillNo = HBillNo.substring(0, 13);
+ k = 01;
+ HBillNo = HBillNo + '-' + String(k).padStart(2, '0');
+ HSourceInterID = subdata[i].HICMOInterID;
+ HSourceEntryID = subdata[i].HICMOEntryID;
+ }
+
+
+ rowdata.push(
+ {
+ "HICMOInterID": subdata[i].HICMOInterID, "HICMOEntryID": subdata[i].HICMOEntryID, "HICMOBillNo": subdata[i].HICMOBillNo
+ , "HWorkShopID": subdata[i].HWorkShopID, "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
+ , "HUsableQty": subdata[i].HUsableQty, "HLotcardQty": subdata[i].HLotcardQty, "HProQty": subdata[i].HProQty
+ , "HRoutingInterID": subdata[i].HRoutingInterID, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty
+ , "HDate": formatDate(subdata[i].HDate), "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": subdata[i].HBatchNo
+ , "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": "", "HProjectNum": "", "HMateOutBatchNo": "", "HMouldNum": "0#"
+ }
+ )
+ }
+ var HInterID = 0;
+ var HEntryID = 0;
+ var HRowBackgroundColor = "#E0F5F7";
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
+ , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 120 }//鐢熶骇璁㈠崟鍙�
+ , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, hide: true }
+ , { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
+ , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵规鍙�', width: 110, edit: 'text', hide: true }
+ , { field: 'HProjectNum', title: '椤圭洰缂栧彿', width: 110, edit: 'text', hide: true }
+ , { field: 'HMateOutBatchNo', title: '鍘熸枡鎵规', width: 110, edit: 'text', hide: true }
+ , { field: 'HMouldNum', title: '妯＄┐鍙�', width: 110, hide: true }
+ , { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text', hide: true }
+ , { field: 'HBatchManager', title: '鍚敤鎵规', width: 110, hide: true }
+ , { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
+ , { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170, edit: 'text', event: "HRoutingName" }
+ , { field: 'HDate', title: '娴佽浆鍗℃棩鏈�', width: 120, event: 'HDate' }
+ , { field: 'HInterID', title: '娴佽浆鍗″唴鐮�', width: 130, hide: true }
+ , { field: 'HBillNo', title: '娴佽浆鍗″彿', width: 170 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ , data: rowdata
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 200, 500, 5000, 50000]
+ , limit: 200
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HInterID == 0 && HEntryID == 0) {
+ HInterID = item.HICMOInterID
+ HEntryID = item.HICMOEntryID
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor)
+ } else if (HInterID == item.HICMOInterID && HEntryID == item.HICMOEntryID) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor)
+ } else if ((HInterID != item.HICMOInterID || HEntryID != item.HICMOEntryID) && HInterID != 0) {
+ if (HRowBackgroundColor == "#E0F5F7") {
+ HRowBackgroundColor = "#E8E5FA"
+ } else {
+ HRowBackgroundColor = "#E0F5F7"
+ }
+ HInterID = item.HICMOInterID
+ HEntryID = item.HICMOEntryID
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor)
+ }
+ })
+ }
+ }
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
+ var sSubTable = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ sSubTable.push(table.cache["mainTable"][i])
+ }
+ if (table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+ table.cache["mainTable"][i].鐗╂枡鍚嶇О = table.cache["mainTable"][i].鐗╂枡鍚嶇О.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+ table.cache["mainTable"][i].瑙勬牸鍨嬪彿 = table.cache["mainTable"][i].瑙勬牸鍨嬪彿.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ }
+ var sSubStr = JSON.stringify(sSubTable);
+ var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/Add_Sc_ICMO_DH", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#print-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵撳嵃鎸夐挳鍚敤
+ layer.close(index);
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+ layer.close(index);
+ }
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+ layer.close(index);
+ }
+ });
+ }
+ //#endregion
+
+ //琛屽唴F7浜嬩欢
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //宸ヨ壓璺嚎
+ if (obj.event == "HRoutingName") {
+ //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ヨ壓璺嚎鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html?HMaterID=' + obj.data.HMaterID + '&HProID=' + 0, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HRoutingInterID": checkStatus.data[0].hmainid
+ , "HRoutingName": checkStatus.data[0].宸ヨ壓鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ obj.event = "";
+ return false;
+ }
+
+ })
+ }
+
+ //鎵撳嵃
+ function get_Print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length >= 1) {
+ var HInterID_Arr = [];
+
+ for (var i = 0; i < data.length; i++) {
+ HInterID_Arr.push(data[i].HInterID.toString());
+ }
+
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HInterID_Arr.toString() + "|" + 0 + '&MyMsg=' + HInterID_Arr.toString() + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑娴佽浆鍗★紒');
+ }
+ }
+
+
+ //鎵归噺鎵撳嵃
+ var time;
+ var num = 0;
+ function get_BatchPrint() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length > 0) {
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
+ time = setInterval(function () {
+ dy_PL(data);
+ }, 2500);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ }
+
+ function dy_PL(rest) {
+ var HInterID = rest[num].HInterID.toString();
+ var sWhere = "select cast( b.娴佹按鍙� as float) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.閿�鍞鍗曞彿,a.鐢熶骇鏁伴噺,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭浠ｇ爜,b.宸ュ簭鍚嶇О,a.鎵瑰彿,b.宸ヨ壓宸ヤ綔涓績,b.宸ヨ壓宸ヨ壓鍙傛暟,a.鐢熶骇杞﹂棿,b.宸ユ鍚嶇О,b.鐢熶骇璁㈠崟鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") and b.宸ュ簭浠ｇ爜 != '9999' order by cast(b.娴佹按鍙� as int)"
+
+ $.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++) {
+ data.data[i]["娴佹按鍙�"] = data.data[i]["娴佹按鍙�"].toFixed(1);
+ dataPrint.push(data.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/娴佽浆鍗SON.grf"),
+ data: Customer
+ };
+
+ console.log(data.data[0].鍗曟嵁鍙�);
+ //var args = {
+ // report: urlAddRandomNo("../../grf/cs10.grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+
+ if (rest.length <= num + 1) {
+ num = 0;
+ clearInterval(time);
+ } else {
+ num++;
+ }
+
+ var sql = "update a set HPrintDate = getdate() from Sc_ProcessExchangeBillMain a with(nolock) where HInterID = " + HInterID + " and HPrintDate is null";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sql },
+ success: function (result) {
+ if (result.data.code != 1) {
+ layer.alert("鏇存柊鎵撳嵃鏃ユ湡寮傚父锛�" + result.data.Message);
+ }
+ }
+ })
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ }
+
+ function get_BatchPrint1(tyep) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length > 0) {
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
+ time = setInterval(function () {
+ dy_PL1(data, tyep);
+ }, 2500);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ }
+
+ function dy_PL1(rest, tyep) {
+ var HInterID = rest[num].HInterID.toString();
+ var sWhere = "select a.HBillNo 娴佽浆鍗＄紪鍙� ,a.HMateOutBatchNo 鍘熸枡鎵规,a.HICMOBillNo 浠诲姟鍗曞彿,m2.HNumber 浜у搧浠ｇ爜,CAST(a.HQty AS dec(18, 0)) 娴佽浆鍗℃暟閲�,a.HProjectNum 椤圭洰鍙�,m2.HName 浜у搧鍚嶇О,CAST(a.HPlanQty AS dec(18, 0)) 鐢熶骇鏁伴噺,m2.HModel 浜у搧瑙勬牸,ltrim(b.HProcNo) 娴佹按鍙� ,p.HName 宸ュ簭鍚嶇О,c.HName 鐢熶骇璧勬簮,convert(varchar(16),getdate(),20) 妫�娴嬫椂闂� from Sc_ProcessExchangeBillMain a inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID left join Gy_Material m2 on a.HMaterID2=m2.hitemid left join Gy_Process p on b.HProcID=p.hitemid left join Gy_Source s on b.HSourceID=s.HItemID left join(select b1.HInterID,s.HName from Sc_ProcessExchangeBillSub b1 left join Gy_Process p on b1.HProcID=p.hitemid left join Gy_Source s on b1.HSourceID=s.HItemID where p.HName='娉ㄥ瀹氬瀷') c on a.HInterID=c.HInterID where b.HInterID in(" + Request.Params["linterid"] + ") order by cast(b.HProcNo as int)"
+
+ $.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++) {
+ data.data[i]["娴佹按鍙�"] = data.data[i]["娴佹按鍙�"].toFixed(1);
+ dataPrint.push(data.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+ var report1 = "";
+ if (tyep==1) {
+ report1 = urlAddRandomNo("../../grf/璐ㄩ噺娴佽浆鍗mr.grf");
+ } else if (tyep==2) {
+ report1 = urlAddRandomNo("../../grf/鍗风粫璐ㄩ噺娴佽浆鍗�.grf");
+ }
+ var args = {
+ type: "print",
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: report1,
+ data: Customer
+ };
+
+ console.log(data.data[0].鍗曟嵁鍙�);
+
+ webapp_ws_ajax_run(args);
+
+ if (rest.length <= num + 1) {
+ num = 0;
+ clearInterval(time);
+ } else {
+ num++;
+ }
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ }
+
+
+ //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+
+ for (var i = 0; i < oldData.length; i++) {
+ if (option.data[i].HICMOInterID == data.HICMOInterID && option.data[i].HICMOEntryID == data.HICMOEntryID) {
+ option.data[i].HSheetQty = Number(option.data[i].HSheetQty) - Number(1);
+ }
+ $('#HMouldNum' + i).find("option[value='" + oldData[i].HMouldNum + "']").attr("selected", true);
+ }
+
+ table.render(option);
+ form.render('select');
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //#region 鏁版嵁鏍￠獙
+ function AllowLoadData(data) {
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HProQty == 0 || sSubStr[i].HProQty == undefined || sSubStr[i].HProQty == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,娴佽浆鍗℃暟閲忎负0!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HRoutingInterID == 0 || sSubStr[i].HRoutingInterID == undefined || sSubStr[i].HRoutingInterID == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓璺嚎鏈�夋嫨!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HICMOInterID == 0 || sSubStr[i].HICMOInterID == undefined || sSubStr[i].HICMOInterID == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇璁㈠崟涓诲唴鐮佽幏鍙栧紓甯革紝璇疯仈绯荤鐞嗗憳澶勭悊!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HICMOEntryID == 0 || sSubStr[i].HICMOEntryID == undefined || sSubStr[i].HICMOEntryID == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇璁㈠崟涓诲唴鐮佽幏鍙栧紓甯革紝璇疯仈绯荤鐞嗗憳澶勭悊!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+
+ return true;
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </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/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
index 3ef15f1..17336ab 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
@@ -327,12 +327,12 @@
}
//鍔犺浇缃戞牸
- function get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere) {
+ function get_Display(HDate1,HDate2,txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere) {
var wait = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_Tk',
type: "GET",
- data: {"txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName, "sWhere": sWhere },
+ data: { "HDate1": HDate1, "HDate2": HDate2,"txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName, "sWhere": sWhere },
success: function (data1) {
var col = [];
if (data1.count == 1) {
@@ -385,7 +385,8 @@
function get_FastQuery() {
var HDate1 = $("#HDate1").val();
var HDate2 = $("#HDate2").val();
- sWhere = "and 宸ュ簭瀹屽伐鏃ユ湡1 >='" + HDate1 + "' and 宸ュ簭瀹屽伐鏃ユ湡1<='" + HDate2 + "'";
+ sWhere = "";
+ //sWhere = "and 宸ュ簭瀹屽伐鏃ユ湡1 >='" + HDate1 + "' and 宸ュ簭瀹屽伐鏃ユ湡1<='" + HDate2 + "'";
var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
@@ -469,7 +470,7 @@
sWhere += " and " + ColName2 + " " + com2;
}
- get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
+ get_Display(HDate1,HDate2,txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
//sWhere = "'" + HDate1 + "','" + HDate2 + "','" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 0e6bd5c..faee01a 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -1173,7 +1173,7 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "Kf_POStockInBill/cx",
+ url: GetWEBURL() + "/Kf_POStockInBill/cx",
type: "GET",
data: {
"HInterID": linterid
--
Gitblit v1.9.1