From ef69c716488bda2994937e6e08b402960bc1aeba Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 13:35:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx.designer.cs | 26
WebTM/Vlog/webapi20220512.txt | 9
WebTM/views/生产管理/生产装箱单/QK_PackedBillList.html | 11
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 179 +-
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html | 29
WebTM/views/grf/生产单.grf | 107
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html | 1
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 4
WebTM/views/grf/物料名称条码.grf | 276 +++
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 27
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_PackingBillList.aspx | 45
WebTM/views/grf/包装方式条码.grf | 276 +++
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html | 84
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 701 +++++----
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx.cs | 17
WebTM/Vlog/webapi20220529.txt | 1
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 59
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipFileMainBill.aspx.designer.cs | 9
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 11
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 374 ++++
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 1
WebTM/WebTM.csproj | 22
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ICMOBillList.aspx | 12
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 7
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 76
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 78
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html | 32
WebTM/Vlog/webapi20220518.txt | 1
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 48
WebTM/views/grf/花型条码.grf | 294 +++
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 29
WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx.cs | 17
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html | 7
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 2
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html | 7
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | 7
WebTM/views/index.html | 27
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 6
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
WebTM/Vlog/webapi20220517.txt | 1
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 7
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 1
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 596 +++++++
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 72
WebTM/views/PublicPage/EqpInformation.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx | 46
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs | 26
WebTM/views/grf/工序流转.grf | 680 ++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 175 +
50 files changed, 3,764 insertions(+), 765 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 35ff0f9..02eaca5 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
- <History>True|2022-04-22T09:26:31.1780137Z;True|2022-04-19T16:20:09.8422169+08:00;False|2022-04-12T15:13:02.1028573+08:00;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+ <History>True|2022-05-13T06:56:55.6031908Z;True|2022-04-22T17:26:31.1780137+08:00;True|2022-04-19T16:20:09.8422169+08:00;False|2022-04-12T15:13:02.1028573+08:00;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/style/admin.css">
@@ -18,10 +18,10 @@
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>04/22/2022 17:25:49</publishTime>
+ <publishTime>05/13/2022 14:55:57</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>04/22/2022 17:25:49</publishTime>
+ <publishTime>05/13/2022 14:55:57</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/19/2022 10:43:59</publishTime>
@@ -1106,6 +1106,9 @@
<File Include="views/grf/HMouldProdInBillA4.grf">
<publishTime>10/04/2021 13:41:09</publishTime>
</File>
+ <File Include="views/grf/鍖呰鏂瑰紡鏉＄爜.grf">
+ <publishTime>05/12/2022 13:55:34</publishTime>
+ </File>
<File Include="views/grf/鍙戣揣閫氱煡鍗�.grf">
<publishTime>04/11/2022 14:30:58</publishTime>
</File>
@@ -1160,6 +1163,9 @@
<File Include="views/grf/鏀舵枡閫氱煡鍗�.grf">
<publishTime>04/11/2022 14:30:58</publishTime>
</File>
+ <File Include="views/grf/鐗╂枡鍚嶇О鏉＄爜.grf">
+ <publishTime>05/12/2022 13:55:34</publishTime>
+ </File>
<File Include="views/grf/鐗╂枡鏉＄爜.grf">
<publishTime>03/17/2022 14:11:22</publishTime>
</File>
@@ -1171,6 +1177,9 @@
</File>
<File Include="views/grf/鐢熶骇璁㈠崟.grf">
<publishTime>04/11/2022 14:30:58</publishTime>
+ </File>
+ <File Include="views/grf/鑺卞瀷鏉＄爜.grf">
+ <publishTime>05/12/2022 13:55:34</publishTime>
</File>
<File Include="views/grf/璁惧妗ｆ.grf">
<publishTime>12/23/2021 15:31:43</publishTime>
@@ -1215,7 +1224,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/indexMenu.html">
<publishTime>02/25/2022 18:33:51</publishTime>
@@ -1452,7 +1461,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/user/login.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/10/2022 10:47:12</publishTime>
</File>
<File Include="views/user/reg.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -1662,7 +1671,7 @@
<publishTime>12/22/2021 16:02:49</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
- <publishTime>02/10/2022 17:29:15</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/鍝佽川绠＄悊/鎴愬搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -1689,7 +1698,7 @@
<publishTime>02/16/2022 11:16:48</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
- <publishTime>02/10/2022 17:29:15</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -1803,7 +1812,7 @@
<publishTime>11/05/2021 15:45:14</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>04/12/2022 16:30:54</publishTime>
+ <publishTime>05/13/2022 11:22:54</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html">
<publishTime>02/10/2022 17:29:15</publishTime>
@@ -1910,11 +1919,20 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_MouldTypeBill.aspx">
<publishTime>04/02/2022 14:20:20</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_QK_BZPackingBillList.aspx">
+ <publishTime>05/12/2022 13:52:19</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_QK_HXPackingBillList.aspx">
+ <publishTime>05/12/2022 13:52:23</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_QK_PackingBillList.aspx">
<publishTime>04/11/2022 16:55:14</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_QK_WLPackingBillList.aspx">
+ <publishTime>05/12/2022 13:55:39</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ICMOBillList.aspx">
- <publishTime>04/22/2022 15:58:16</publishTime>
+ <publishTime>04/27/2022 15:56:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
<publishTime>02/10/2022 17:29:15</publishTime>
@@ -1971,7 +1989,7 @@
<publishTime>02/10/2022 17:30:19</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>04/12/2022 16:30:54</publishTime>
+ <publishTime>05/13/2022 11:22:54</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2367,7 +2385,7 @@
<publishTime>09/13/2021 10:11:41</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
- <publishTime>02/23/2022 18:01:22</publishTime>
+ <publishTime>04/24/2022 16:16:39</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
<publishTime>04/19/2022 10:46:38</publishTime>
@@ -2648,6 +2666,9 @@
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">
<publishTime>09/14/2021 08:59:03</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html">
+ <publishTime>05/06/2022 10:57:40</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/EXecptFeedMessage.html">
<publishTime>12/07/2021 19:09:26</publishTime>
</File>
@@ -2727,10 +2748,10 @@
<publishTime>04/01/2022 17:41:37</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">
<publishTime>04/19/2022 10:43:59</publishTime>
@@ -2757,7 +2778,7 @@
<publishTime>09/14/2021 08:59:03</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <publishTime>04/20/2022 19:38:09</publishTime>
+ <publishTime>05/11/2022 09:55:52</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -2820,10 +2841,10 @@
<publishTime>02/18/2022 16:21:15</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
<publishTime>02/10/2022 17:29:15</publishTime>
@@ -2847,10 +2868,10 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇瑁呯鍗�/QK_PackedBillList.html">
- <publishTime>04/11/2022 17:35:09</publishTime>
+ <publishTime>05/12/2022 14:11:12</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇瑁呯鍗�/QK_PackingBill.html">
- <publishTime>04/12/2022 09:53:16</publishTime>
+ <publishTime>05/13/2022 14:46:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇瑁呯鍗�/Sc_PackUnionBill_Fast.html">
<publishTime>02/18/2022 17:04:22</publishTime>
@@ -2867,8 +2888,11 @@
<File Include="views/鐢熶骇绠＄悊/缁勮鍗�/Sc_GroupOrderBillList.html">
<publishTime>02/10/2022 17:29:15</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html">
+ <publishTime>05/06/2022 10:57:40</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">
<publishTime>09/09/2021 15:03:44</publishTime>
@@ -2934,10 +2958,10 @@
<publishTime>03/17/2022 14:11:22</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
- <publishTime>04/22/2022 17:21:07</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
<publishTime>03/01/2022 17:51:08</publishTime>
@@ -3300,7 +3324,7 @@
<publishTime>04/01/2022 17:41:37</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
- <publishTime>04/13/2022 20:36:54</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">
<publishTime>12/23/2021 15:43:26</publishTime>
@@ -3315,7 +3339,7 @@
<publishTime>02/23/2022 14:26:14</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>04/13/2022 20:36:54</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
<publishTime>10/19/2021 16:08:25</publishTime>
@@ -3345,7 +3369,7 @@
<publishTime>04/11/2022 14:30:58</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
- <publishTime>04/13/2022 20:36:54</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
<publishTime>04/11/2022 14:30:58</publishTime>
@@ -3354,7 +3378,7 @@
<publishTime>02/23/2022 14:26:14</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>04/13/2022 20:36:54</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
<publishTime>04/11/2022 14:30:58</publishTime>
@@ -3555,7 +3579,7 @@
<publishTime>04/15/2022 16:02:48</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/22/2022 17:26:24</publishTime>
+ <publishTime>05/13/2022 14:56:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/Vlog/webapi20220512.txt b/WebTM/Vlog/webapi20220512.txt
new file mode 100644
index 0000000..d2ef12a
--- /dev/null
+++ b/WebTM/Vlog/webapi20220512.txt
@@ -0,0 +1,9 @@
+2022/5/12 14:27:39 鎵撳嵃sql:select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HBarCode 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in ('6819')
+
+2022/5/12 14:28:44 鎵撳嵃sql:select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HBarCode 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in ('6819')
+
+2022/5/12 14:35:29 鎵撳嵃sql:select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HBarCode 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in ('6819')
+
+2022/5/12 14:43:55 鎵撳嵃sql:select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HBarCode 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in ('6819')
+
+2022/5/12 14:49:21 鎵撳嵃sql:select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=1529 order by hmainid
diff --git a/WebTM/Vlog/webapi20220517.txt b/WebTM/Vlog/webapi20220517.txt
new file mode 100644
index 0000000..572735a
--- /dev/null
+++ b/WebTM/Vlog/webapi20220517.txt
@@ -0,0 +1 @@
+2022/5/17 13:44:42 鎵撳嵃sql:select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�,fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 from Gy_BarCodeBill a left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID where a.HItemID in ('30983')
diff --git a/WebTM/Vlog/webapi20220518.txt b/WebTM/Vlog/webapi20220518.txt
new file mode 100644
index 0000000..4ccabd2
--- /dev/null
+++ b/WebTM/Vlog/webapi20220518.txt
@@ -0,0 +1 @@
+2022/5/18 10:46:56 鎵撳嵃sql:select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�,fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 from Gy_BarCodeBill a left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID where a.HItemID in ('6932','6932')
diff --git a/WebTM/Vlog/webapi20220529.txt b/WebTM/Vlog/webapi20220529.txt
new file mode 100644
index 0000000..38b500e
--- /dev/null
+++ b/WebTM/Vlog/webapi20220529.txt
@@ -0,0 +1 @@
+2022/5/29 23:26:46 鎵撳嵃sql:select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid=440
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 61a1154..2b62edd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -206,6 +206,10 @@
<Content Include="views\grf\澧欏挃鏉＄爜.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鐢熶骇鍗�.grf" />
<Content Include="views\grf\鐢熶骇鍗�.grf" />
+ <Content Include="views\grf\鐗╂枡鍚嶇О鏉＄爜.grf" />
+ <Content Include="views\grf\鍖呰鏂瑰紡鏉＄爜.grf" />
+ <Content Include="views\grf\鑺卞瀷鏉＄爜.grf" />
+ <Content Include="views\grf\宸ュ簭娴佽浆.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -644,7 +648,9 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckEdit.html" />
@@ -859,6 +865,8 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackedBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackingBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatFormImport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
@@ -1310,6 +1318,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.cs">
+ <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1317,6 +1332,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
<DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/PublicPage/EqpInformation.html b/WebTM/views/PublicPage/EqpInformation.html
index 327f12a..0b7d145 100644
--- a/WebTM/views/PublicPage/EqpInformation.html
+++ b/WebTM/views/PublicPage/EqpInformation.html
@@ -144,7 +144,7 @@
, cellMinWidth: 90
, cols: [[
{ type: 'radio', fixed: 'left' }
- , { field: 'HInterID', title: 'HItemID', sort: true, hide: true }
+ , { field: 'HInterID', title: 'HInterID', sort: true, hide: true }
, { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
, { field: 'HNumber', title: '璁惧浠ｇ爜' }
, { field: 'HName', title: '璁惧' }
diff --git "a/WebTM/views/grf/\345\214\205\350\243\205\346\226\271\345\274\217\346\235\241\347\240\201.grf" "b/WebTM/views/grf/\345\214\205\350\243\205\346\226\271\345\274\217\346\235\241\347\240\201.grf"
new file mode 100644
index 0000000..a9a6a86
--- /dev/null
+++ "b/WebTM/views/grf/\345\214\205\350\243\205\346\226\271\345\274\217\346\235\241\347\240\201.grf"
@@ -0,0 +1,276 @@
+锘縊bject Report
+ Version='6.8.2.5'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9.5
+ Height=10
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='閿�鍞鍗曞彿'
+ End
+ Item
+ Name='鍖呰鏂瑰紡'
+ End
+ Item
+ Name='澧欏挃A/U缂�'
+ End
+ Item
+ Name='鏁伴噺'
+ End
+ Item
+ Name='绠卞彿'
+ End
+ Item
+ Name='澶栧寘澶囨敞'
+ End
+ Item
+ Name='鑱旂郴浜�'
+ End
+ Item
+ Name='鏀惰揣鏂瑰湴鍧�'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=9.49854
+ End
+ End
+Object ColumnContent
+ Height=10.0013
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=3
+ Top=2.5
+ Width=2.40771
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鑱旂郴浜�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Left=3
+ Top=3.5
+ Width=6.00604
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鍖呰鏂瑰紡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Left=3
+ Top=4.5
+ Width=3.20146
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澧欏挃A/U缂�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=3
+ Top=5.5
+ Width=2.61938
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏁伴噺'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox5'
+ Left=3
+ Top=6.5
+ Width=3.01625
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='绠卞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=3
+ Top=7.5
+ Width=6.00604
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澶栧寘澶囨敞'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.19125
+ Top=5.00063
+ Width=2.25
+ Height=1.79917
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#璁㈠崟鍙�#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox7'
+ Left=5.4
+ Top=2.5
+ Width=3.59833
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Left=3.01625
+ Top=8.14917
+ Width=6.00604
+ Height=1.03188
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=TopLeft
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=3
+ Top=1.5
+ Width=6.00604
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='閿�鍞鍗曞彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=0.79375
+ Top=1.5
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗曟嵁缂栧彿锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.926042
+ Top=8.06979
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏀惰揣鍦板潃锛�'
+ End
+ End
+ End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ 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/grf/\345\267\245\345\272\217\346\265\201\350\275\254.grf" "b/WebTM/views/grf/\345\267\245\345\272\217\346\265\201\350\275\254.grf"
new file mode 100644
index 0000000..9a559b2
--- /dev/null
+++ "b/WebTM/views/grf/\345\267\245\345\272\217\346\265\201\350\275\254.grf"
@@ -0,0 +1,680 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Height=29.7
+ Oriention=Landscape
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='宸ュ崟鏁伴噺'
+ End
+ Item
+ Name='璁㈠崟鏁伴噺'
+ End
+ Item
+ Name='涓嬪崟鏃ユ湡'
+ End
+ Item
+ Name='璁″垝瀹屽伐鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ DBFieldName='宸ヨ壓鍚嶇О'
+ End
+ Item
+ Name='鍔犲伐璇存槑'
+ End
+ Item
+ Name='娴佽浆鍗＄紪鍙�'
+ End
+ Item
+ Name='娴佽浆鍗℃暟閲�'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='璁″垝寮�宸ユ棩鏈�'
+ Type=DateTime
+ Format='yyyy//MM//dd'
+ End
+ Item
+ Name='鍘熸枡鎵规'
+ End
+ Item
+ Name='妯″叿璁惧'
+ End
+ Item
+ Name='娴佹按鍙�'
+ End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
+ Item
+ Name='浜у搧瑙勬牸'
+ End
+ Item
+ Name='璁㈠崟璺熻釜鍙�'
+ End
+ Item
+ Name='椤圭洰鍙�'
+ End
+ Item
+ Name='鐢熶骇璁㈠崟鍙�'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='鍥惧彿鐗堟湰'
+ End
+ Item
+ Name='鎴愬搧缂栧彿'
+ End
+ Item
+ Name='鏉愯川'
+ End
+ Item
+ Name='宸ヨ壓鍙傛暟'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='妯″叿缂栧彿'
+ End
+ Item
+ Name='鐗堟湰'
+ End
+ Item
+ Name='鎬昏鍥惧彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column11'
+ Width=0.978958
+ End
+ Item
+ Name='Column1'
+ Width=1.5875
+ End
+ Item
+ Name='Column2'
+ Width=1.79917
+ End
+ Item
+ Name='Column3'
+ Width=1.79917
+ End
+ Item
+ Name='Column4'
+ Width=1.79917
+ End
+ Item
+ Name='Column5'
+ Width=1.79917
+ End
+ Item
+ Name='Column6'
+ Width=1.40229
+ End
+ Item
+ Name='Column7'
+ Width=2.59292
+ End
+ Item
+ Name='Column8'
+ Width=5.02708
+ End
+ Item
+ Name='Column9'
+ Width=6.58813
+ End
+ Item
+ Name='Column10'
+ Width=1.19063
+ End
+ End
+ Object ColumnContent
+ Height=1.79917
+ RowsPerPage=12
+ Items ColumnContentCell
+ Item
+ Column='Column11'
+ DataField='娴佹按鍙�'
+ End
+ Item
+ Column='Column1'
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column2'
+ End
+ Item
+ Column='Column3'
+ End
+ Item
+ Column='Column4'
+ End
+ Item
+ Column='Column5'
+ End
+ Item
+ Column='Column6'
+ End
+ Item
+ Column='Column7'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid3'
+ Top=-0.0264583
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=2
+ RowCount=1
+ Items FreeGridColumn
+ Item[1]
+ Width=1.29646
+ End
+ Item[2]
+ Width=1.27
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=1.905
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ BorderCustom=T
+ End
+ End
+ End
+ End
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='妯″叿缂栧彿'
+ End
+ Item
+ Column='Column9'
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='宸ヨ壓鍙傛暟'
+ End
+ Item
+ Column='Column10'
+ TextAlign=MiddleCenter
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=1.5875
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column11'
+ TextAlign=MiddleCenter
+ Text='娴佹按\r\n鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ TextAlign=MiddleCenter
+ Text='宸ヨ壓鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ TextAlign=MiddleCenter
+ Text='瀹屾垚鏃堕棿'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ TextAlign=MiddleCenter
+ Text='鎿嶄綔鑰�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column4'
+ TextAlign=MiddleCenter
+ Text='棣栨'
+ End
+ Item
+ GroupTitle=F
+ Column='Column5'
+ TextAlign=MiddleCenter
+ Text='杞簭妫�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column6'
+ TextAlign=MiddleCenter
+ Text='鑹搧鏁�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column7'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid2'
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ ShadowColor=White
+ End
+ ColumnCount=2
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.27
+ End
+ Item[2]
+ Width=1.32292
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=0.687917
+ End
+ Item[2]
+ Height=0.926042
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ TextAlign=MiddleCenter
+ Text='涓嶈壇鍝佹暟'
+ ColSpan=2
+ End
+ Item[2,1]
+ TextAlign=MiddleCenter
+ Text='鏉ユ枡\r\n涓嶈壇'
+ End
+ Item[2,2]
+ TextAlign=MiddleCenter
+ Text='宸ュ簭\r\n涓嶈壇'
+ End
+ End
+ End
+ End
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ TextAlign=MiddleCenter
+ Text='妯℃鍏风紪鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ TextAlign=MiddleCenter
+ Text='鍔犲伐鍐呭瑕佹眰'
+ End
+ Item
+ GroupTitle=F
+ Column='Column10'
+ TextAlign=MiddleCenter
+ Text='澶囨敞'
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=3.99521
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=7.80521
+ Top=0.211667
+ Width=8.99583
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=217500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐢熶骇宸ュ崟'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.079375
+ Top=1.40229
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ崟鍙�:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=0.079375
+ Top=2.2225
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎴愬搧缂栧彿:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=18.5208
+ Top=2.14313
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏉愯川鏂欏帤:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox5'
+ Left=9.71021
+ Top=1.40229
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧缂栫爜:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox6'
+ Left=18.5208
+ Top=1.34938
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='灏忕増鏈�:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=11.721
+ Top=1.40229
+ Width=6.77333
+ Height=0.608542
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox7'
+ Left=9.68375
+ Top=2.11667
+ Width=2.11667
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.87375
+ Top=1.42875
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ崟鏁伴噺:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox9'
+ Left=5.87375
+ Top=2.11667
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁㈠崟鏁伴噺:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=11.8004
+ Top=2.11667
+ Width=6.69396
+ Height=0.608542
+ DataField='浜у搧鍚嶇О'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Left=7.67292
+ Top=1.42875
+ Width=1.79917
+ Height=0.608542
+ DataField='娴佽浆鍗℃暟閲�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox10'
+ Left=0.132292
+ Top=3.20146
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='涓嬪崟鏃ユ湡:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox11'
+ Left=5.79438
+ Top=3.04271
+ Width=2.59292
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁″垝瀹屽伐鏃ユ湡:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=1.93146
+ Top=3.20146
+ Width=2.32833
+ Height=0.608542
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=8.38729
+ Top=3.04271
+ Width=2.38125
+ Height=0.79375
+ DataField='璁″垝瀹屽伐鏃ユ湡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=1.48167
+ Top=1.40229
+ Width=2.80458
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇璁㈠崟鍙�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox12'
+ Left=1.48167
+ Top=1.40229
+ Width=2.59292
+ Height=0.608542
+ DataField='浠诲姟鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=20.32
+ Top=1.34938
+ Width=3.20146
+ Height=0.582083
+ DataField='鐗堟湰'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox15'
+ Left=18.6002
+ Top=2.98979
+ Width=5.21229
+ Height=0.820208
+ WordWrap=T
+ TextAlign=MiddleCenter
+ DataField='鏉愯川'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=23.8125
+ Top=1.00542
+ Width=2.59292
+ Height=2.80458
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鍗曟嵁鍙�#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox13'
+ Left=7.88458
+ Top=2.11667
+ Width=1.5875
+ Height=0.608542
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox16'
+ Left=1.87854
+ Top=2.2225
+ Width=3.91583
+ Height=0.582083
+ DataField='鎴愬搧缂栧彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox14'
+ Left=10.8744
+ Top=3.20146
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ簭娴佽浆鍗″彿:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox17'
+ Left=13.679
+ Top=3.20146
+ Width=2.98979
+ Height=0.608542
+ DataField='鍗曟嵁鍙�'
+ End
+ End
+ RepeatOnPage=T
+ End
+ End
+End
diff --git "a/WebTM/views/grf/\347\211\251\346\226\231\345\220\215\347\247\260\346\235\241\347\240\201.grf" "b/WebTM/views/grf/\347\211\251\346\226\231\345\220\215\347\247\260\346\235\241\347\240\201.grf"
new file mode 100644
index 0000000..a1f062a
--- /dev/null
+++ "b/WebTM/views/grf/\347\211\251\346\226\231\345\220\215\347\247\260\346\235\241\347\240\201.grf"
@@ -0,0 +1,276 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9.5
+ Height=10
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='閿�鍞鍗曞彿'
+ End
+ Item
+ Name='閿�鍞墿鏂欏悕绉�'
+ End
+ Item
+ Name='澧欏挃缂�'
+ End
+ Item
+ Name='鏁伴噺'
+ End
+ Item
+ Name='绠卞彿'
+ End
+ Item
+ Name='澶栧寘澶囨敞'
+ End
+ Item
+ Name='鑱旂郴浜�'
+ End
+ Item
+ Name='鏀惰揣鏂瑰湴鍧�'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=9.49854
+ End
+ End
+ Object ColumnContent
+ Height=10.0013
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=3
+ Top=2.5
+ Width=2.40771
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鑱旂郴浜�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Left=3
+ Top=3.5
+ Width=6.00604
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='閿�鍞墿鏂欏悕绉�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Left=3
+ Top=4.5
+ Width=2.80458
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澧欏挃缂�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=3
+ Top=5.5
+ Width=2.61938
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏁伴噺'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox5'
+ Left=3
+ Top=6.5
+ Width=3.01625
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='绠卞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=3
+ Top=7.5
+ Width=6.00604
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澶栧寘澶囨敞'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.40292
+ Top=4.78896
+ Width=2.25
+ Height=1.79917
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#璁㈠崟鍙�#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox7'
+ Left=5.4
+ Top=2.5
+ Width=3.59833
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=3
+ Top=1.5
+ Width=5.82083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='閿�鍞鍗曞彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=0.79375
+ Top=1.5
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗曟嵁缂栧彿锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.820208
+ Top=8.12271
+ Width=2.01083
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏀惰揣鍦板潃锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=3.01625
+ Top=8.20208
+ Width=5.97958
+ Height=0.873125
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=TopLeft
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ End
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ 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/grf/\347\224\237\344\272\247\345\215\225.grf" "b/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
index 1492e11..0e24dea 100644
--- "a/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
+++ "b/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
@@ -10,14 +10,14 @@
Oriention=Landscape
LeftMargin=1.5
TopMargin=0.5
- RightMargin=1.5
+ RightMargin=1.03188
BottomMargin=0.5
End
Object DetailGrid
Object Recordset
Items Field
Item
- Name='鏃ユ湡'
+ Name='閿�鍞鍗曟棩鏈�'
End
Item
Name='鍗曟嵁缂栧彿'
@@ -30,12 +30,17 @@
End
Item
Name='閿�鍞暟閲�'
+ Type=Float
+ Format='0.#####'
End
Item
Name='璐揣鍗曚綅'
End
Item
- Name='鏀惰揣鏂硅仈绯讳汉'
+ Name='閿�鍞鍗曡仈绯讳汉'
+ End
+ Item
+ Name='閿�鍞鍗曠紪鍙�'
End
End
End
@@ -50,39 +55,43 @@
End
Item
Name='鐗╂枡浠ｇ爜'
- Width=3.99521
+ Width=3.59833
End
Item
Name='鐗╂枡'
- Width=3.41313
+ Width=3.01625
End
Item
Name='瑙勬牸鍨嬪彿'
- Width=3.41313
+ Width=3.175
End
Item
Name='Column2'
- Width=2.61938
+ Width=2.40771
End
Item
Name='Column6'
- Width=2.93688
+ Width=1.61396
End
Item
Name='Column7'
- Width=2.59292
+ Width=2.01083
End
Item
Name='Column8'
- Width=2.19604
+ Width=2.38125
End
Item
Name='Column9'
- Width=2.77813
+ Width=2.40771
+ End
+ Item
+ Name='Column10'
+ Width=2.59292
End
End
Object ColumnContent
- Height=2.59292
+ Height=2.19604
Items ColumnContentCell
Item
Column='搴忓彿'
@@ -111,7 +120,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏃ユ湡'
+ DataField='閿�鍞鍗曟棩鏈�'
End
Item
Column='鐗╂枡浠ｇ爜'
@@ -133,7 +142,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='閿�鍞墿鏂欏悕绉�'
+ DataField='閿�鍞鍗曠紪鍙�'
End
Item
Column='瑙勬牸鍨嬪彿'
@@ -144,7 +153,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鍖呰鏂瑰紡'
+ DataField='閿�鍞墿鏂欏悕绉�'
End
Item
Column='Column2'
@@ -152,15 +161,15 @@
Items Control
Item
Type=FieldBox
- Name='FieldBox1'
+ Name='FieldBox3'
Dock=Fill
Object Font
Name='瀹嬩綋'
Weight=400
Charset=134
End
- TextAlign=MiddleCenter
- DataField='閿�鍞暟閲�'
+ WordWrap=T
+ DataField='鍖呰鏂瑰紡'
End
End
End
@@ -175,9 +184,11 @@
Items Control
Item
Type=FieldBox
- Name='FieldBox2'
+ Name='FieldBox1'
Dock=Fill
- DataField='鏀惰揣鏂硅仈绯讳汉'
+ WordWrap=T
+ TextAlign=MiddleCenter
+ DataField='閿�鍞暟閲�'
End
End
End
@@ -202,15 +213,11 @@
Text='[#鍗曟嵁缂栧彿#]'
End
Item
- Type=Barcode
- Name='Barcode4'
- Left=0.185208
- Top=0.343958
- Width=2.19604
- Height=1.98438
- BarcodeType=QRCode
- CaptionPosition=None
- Text='[#鍗曟嵁缂栧彿#]'
+ Type=FieldBox
+ Name='FieldBox2'
+ Dock=Fill
+ WordWrap=T
+ DataField='閿�鍞鍗曡仈绯讳汉'
End
End
End
@@ -222,9 +229,26 @@
Charset=134
End
FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode5'
+ Left=0.185208
+ Top=0.238125
+ Width=1.95792
+ Height=1.77271
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鍗曟嵁缂栧彿#]'
+ End
+ End
End
Item
Column='Column9'
+ TextAlign=MiddleCenter
+End
+Item
+ Column='Column10'
TextAlign=MiddleCenter
End
End
@@ -253,7 +277,7 @@
Charset=134
End
TextAlign=MiddleCenter
- Text='鏃ユ湡'
+ Text='閿�鍞鍗曟棩鏈�'
End
Item
GroupTitle=F
@@ -277,7 +301,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='閿�鍞墿鏂欏悕绉�'
+ Text='閿�鍞鍗曠紪鍙�'
End
Item
GroupTitle=F
@@ -289,7 +313,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='鍖呰鏂瑰紡'
+ Text='閿�鍞墿鏂欏悕绉�'
End
Item
GroupTitle=F
@@ -301,7 +325,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='閿�鍞暟閲�'
+ Text='鍖呰鏂瑰紡'
End
Item
GroupTitle=F
@@ -313,7 +337,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='鏀惰揣鏂硅仈绯讳汉'
+ Text='閿�鍞暟閲�'
End
Item
GroupTitle=F
@@ -325,7 +349,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='锛堜簩缁寸爜锛�'
+ Text='鑱旂郴浜�'
End
Item
GroupTitle=F
@@ -337,7 +361,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='宸茬敓浜�'
+ Text='锛堜簩缁寸爜锛�'
End
Item
GroupTitle=F
@@ -348,6 +372,17 @@
Charset=134
End
TextAlign=MiddleCenter
+ Text='宸茬敓浜�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column10'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
Text='澶囨敞'
End
End
diff --git "a/WebTM/views/grf/\350\212\261\345\236\213\346\235\241\347\240\201.grf" "b/WebTM/views/grf/\350\212\261\345\236\213\346\235\241\347\240\201.grf"
new file mode 100644
index 0000000..5c5c818
--- /dev/null
+++ "b/WebTM/views/grf/\350\212\261\345\236\213\346\235\241\347\240\201.grf"
@@ -0,0 +1,294 @@
+锘縊bject Report
+ Version='6.8.2.5'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9.5
+ Height=10
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='閿�鍞鍗曞彿'
+ End
+ Item
+ Name='鑺卞瀷'
+ End
+ Item
+ Name='澧欏挃A/U缂�'
+ End
+ Item
+ Name='鏁伴噺'
+ End
+ Item
+ Name='绠卞彿'
+ End
+ Item
+ Name='澶栧寘澶囨敞'
+ End
+ Item
+ Name='鑱旂郴浜�'
+ End
+ Item
+ Name='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Name='閿�鍞墿鏂欏悕绉�'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=9.39271
+ End
+ End
+Object ColumnContent
+ Height=10.0013
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=3
+ Top=2.5
+ Width=2.40771
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鑱旂郴浜�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Left=3
+ Top=4
+ Width=5.82083
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鑺卞瀷'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Left=3
+ Top=4.5
+ Width=3.20146
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澧欏挃A/U缂�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=3
+ Top=5.5
+ Width=2.40771
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏁伴噺'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox5'
+ Left=3
+ Top=6.5
+ Width=3.01625
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='绠卞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=3
+ Top=7.5
+ Width=6.00604
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澶栧寘澶囨敞'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.19125
+ Top=5.00063
+ Width=2.25
+ Height=1.79917
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#璁㈠崟鍙�#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox7'
+ Left=5.4
+ Top=2.5
+ Width=3.59833
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Left=3.01625
+ Top=8.12271
+ Width=6.00604
+ Height=1.03188
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=TopLeft
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=3
+ Top=1.5
+ Width=5.82083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='閿�鍞鍗曞彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=0.79375
+ Top=1.5
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗曟嵁缂栧彿锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.9525
+ Top=8.04333
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏀惰揣鍦板潃锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=3
+ Top=3.41
+ Width=5.60917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='閿�鍞墿鏂欏悕绉�'
+ End
+ End
+ End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ 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/index.html b/WebTM/views/index.html
index 3b4c284..620ecd2 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -361,38 +361,45 @@
<a>鏃ヨ鍒掑钩鍙�</a>
<dl class="layui-nav-child">
<dd>
+ <a>鐢熶骇璁″垝骞冲彴</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>
+ </dl>
+ </dd>
+ <dd>
<a>鏃ヨ鍒掑伐鍗�</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html">鏃ヨ鍒掑伐鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>
</dl>
</dd>
<dd>
<a>瑕佹枡璁″垝</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
</dl>
</dd>
<dd>
<a>鎻愭枡璁″垝</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html">鎻愭枡璁″垝鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
</dl>
</dd>
<dd>
<a>鍩虹璧勬枡</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
</dl>
</dd>
<dd>
<a>鍗虫椂搴撳瓨</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html">鍗虫椂搴撳瓨鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
</dl>
</dd>
</dl>
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 b5efdfb..6de6730 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"
@@ -60,6 +60,7 @@
var Type = params[params[1]];
var OpenTmp = params[params[2]];
+
switch (Type) {
//case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
@@ -172,7 +173,10 @@
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HSeOrderBillList.aspx?linterid=" + value, true, "");
break;
case "HQKPackBill"://澧欏挃瑁呯鎵撳嵃
- CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?linterid=" + value, true, "");
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?typename='" + OpenTmp + "'&linterid=" + value, true, "");
+ break;
+ case "HProcessExchange"://宸ュ簭娴佽浆鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + value, true, "");
break;
}
</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/xmlLBM_EquipFileMainBill.aspx.designer.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_EquipFileMainBill.aspx.designer.cs"
index b8aa324..679528d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.designer.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_EquipFileMainBill.aspx.designer.cs"
@@ -22,5 +22,14 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// Button2 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button2;
}
}
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_QK_PackingBillList.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_QK_PackingBillList.aspx"
index 89d7553..e59843f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_QK_PackingBillList.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_QK_PackingBillList.aspx"
@@ -4,18 +4,19 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
- <script runat="server">
- protected void Page_Load(object sender, EventArgs e)
- {
- //鈽呯壒鍒彁绀衡槄锛�
- //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
- //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
- //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- var ids = Request.Params["linterid"];
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ var ids = Request.Params["linterid"];
+ var type=Request.Params["typename"].ToString();
var idsArray = ids.Split(',');
var PrintIds = "";
for (int i = 0; i < idsArray.Length; i++)
@@ -23,9 +24,27 @@
PrintIds += "'" + idsArray[i] + "',";
}
PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
- SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HBarCode 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in ("+ PrintIds+")");
- }
-</script>
+
+ if (type.Trim()=="澧欏挃鏉＄爜")
+ {
+ SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HRemark 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in (" + PrintIds + ")");
+ }
+ else
+ {
+ SqlXMLReportData.GenOneRecordset(this, "select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�," +
+ "fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HRemark 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
+ "from Gy_BarCodeBill a " +
+ " left join Sc_ICMOBillSub b on a.HSourceEntryID=b.HEntryID and a.HSourceInterID = b.HInterID " +
+ "left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID " +
+ "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on f1.FSaleOrderEntryId=fo1.FENTRYID " +
+ "left join AIS20200908101915zs..T_SAL_ORDER fo on fo1.FID=fo.FID " +
+ "LEFT join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
+ "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID " +
+ "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID "+
+ "where a.HItemID in (" + PrintIds + ")");
+ }
+ }
+ </script>
</head>
<body>
<form id="form1" runat="server">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_QK_SPackingBillList.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_QK_SPackingBillList.aspx"
new file mode 100644
index 0000000..ada0806
--- /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_QK_SPackingBillList.aspx"
@@ -0,0 +1,46 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_QK_SPackingBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_QK_SPackingBillList" %>
+
+<!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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ var ids = Request.Params["linterid"];
+ var idsArray = ids.Split(',');
+ var PrintIds = "";
+ for (int i = 0; i < idsArray.Length; i++)
+ {
+ PrintIds += "'" + idsArray[i] + "',";
+ }
+ PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
+ SqlXMLReportData.GenOneRecordset(this, "select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�," +
+ "fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
+ "from Gy_BarCodeBill a " +
+ "left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID " +
+ "left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID " +
+ "left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID " +
+ "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID " +
+ "left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
+ "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID " +
+ "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID "+
+ "where a.HItemID in (" + PrintIds + ")");
+ }
+ </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_QK_SPackingBillList.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_QK_SPackingBillList.aspx.cs"
new file mode 100644
index 0000000..7a73b19
--- /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_QK_SPackingBillList.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_QK_SPackingBillList : 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\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_QK_SPackingBillList.aspx.designer.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_QK_SPackingBillList.aspx.designer.cs"
new file mode 100644
index 0000000..60a5d35
--- /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_QK_SPackingBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_QK_SPackingBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ICMOBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ICMOBillList.aspx"
index e5ec06c..88148db 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ICMOBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ICMOBillList.aspx"
@@ -23,15 +23,15 @@
PrintIds += "'" + idsArray[i] + "',";
}
PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
-
- string sql = string.Format(@"select convert(varchar,f.FSalOrderDate ,23) 閿�鍞鍗曟棩鏈�,a.HBillNo 鍗曟嵁缂栧彿,f.F_YQN_XSDD 閿�鍞鍗曠紪鍙�, f.F_zzzz_Text4 閿�鍞墿鏂欏悕绉�,f.F_zzzz_Text1 閿�鍞鍗曡仈绯讳汉,
- f.F_BZFS 鍖呰鏂瑰紡,b.HQty 閿�鍞暟閲�,convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) 涓诲瓙鍗曞彿
+ LogService.Write(PrintIds);
+ string sql = string.Format(@"select convert(varchar,f1.FSalOrderDate ,23) 閿�鍞鍗曟棩鏈�,a.HBillNo 鍗曟嵁缂栧彿,f1.F_YQN_XSDD 閿�鍞鍗曠紪鍙�, f1.F_zzzz_Text4 閿�鍞墿鏂欏悕绉�,f1.F_ZZZZ_XSDDLXR 閿�鍞鍗曡仈绯讳汉,f1.F_BZFS 鍖呰鏂瑰紡,b.HQty 閿�鍞暟閲�,convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) 涓诲瓙鍗曞彿
from Sc_ICMOBillMain a
left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
- left join AIS20200908101915zs..T_PRD_MOENTRY f on b.HERPInterID=f.FID
+ left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID
+ left join AIS20200908101915zs..T_PRD_MO f on f1.FID=f.FID
left join Xs_SeOrderBillMain x on a.HSeOrderInterID=x.HInterID
- where convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ("+ PrintIds+") order by a.HInterID desc");
-
+ where convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ("+ PrintIds+") order by b.HEntryID");
+ LogService.Write(sql);
SqlXMLReportData.GenOneRecordset(this, sql);
}
</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/xmlLBM_Sc_ProcessExchangeBillList.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.aspx"
new file mode 100644
index 0000000..87ed785
--- /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.aspx"
@@ -0,0 +1,27 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_ProcessExchangeBillList.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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenOneRecordset(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"]);
+ }
+ </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.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.aspx.cs"
new file mode 100644
index 0000000..01fd614
--- /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.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 : 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\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.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.aspx.designer.cs"
new file mode 100644
index 0000000..2f4694a
--- /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.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Sc_ProcessExchangeBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index 5cdb0ae..fe6846d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -110,7 +110,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
-
+
</div>
</div>
<div class="layui-inline">
@@ -234,6 +234,28 @@
<input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
<input id="HICMOInterID" name="HICMOInterID" type="hidden" />
<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曞彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="F_YQN_XSDD" lay-verify="F_YQN_XSDD" id="F_YQN_XSDD" disabled autocomplete="off">
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞墿鏂欏悕绉�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="F_zzzz_Text4" lay-verify="F_zzzz_Text4" id="F_zzzz_Text4" disabled autocomplete="off">
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞暟閲�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="FQTY" lay-verify="FQTY" id="FQTY" disabled autocomplete="off">
</div>
</div>
</div>
@@ -447,6 +469,7 @@
$("#HMainSourceInterID").val("");
$("#HMainSourceEntryID").val("");
$("#HMainSourceBillNo").val("");
+ $('#HMainSourceBillNo').attr("readonly", true);
$("#HMainSourceBillType").val("");
$('#HMainSourceBillNo').attr("disabled", false);
$('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
@@ -487,6 +510,9 @@
, "HICMOInterID": "0"
, "HICMOEntryID": "0"
, "HICMOBillNo": "0"
+ , "F_YQN_XSDD": data.閿�鍞鍗曠紪鍙�
+ , "F_zzzz_Text4": data.閿�鍞墿鏂欏悕绉�
+ , "FQTY": data.閿�鍞暟閲�
});
$("#HMainSourceBillNo").css("box-shadow", "none");
$("#HProcID").val(0);
@@ -1059,6 +1085,7 @@
return Result = false;
}
if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+ $("#HGroupID").val(0);
layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index fbdf895..d127421 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -172,7 +172,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '鎻愭枡鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -391,7 +391,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -406,7 +406,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -414,7 +413,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index ea6df00..38a3fc1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -284,11 +284,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -303,7 +301,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -887,9 +885,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList",
type: "GET",
@@ -912,42 +910,49 @@
, "HExplanation": d.data[0].鎽樿
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
- , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[0].瀛愯〃閲囪喘缁勭粐
- , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�
- , "HDayPlanBillNo": d.data[0].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
- , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[0].HWorkShopID
- , "HWorkShopIDName": d.data[0].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[0].鍙敤閲囪喘鏁伴噺
- , "HPOOrderInterID": d.data[0].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[0].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[0].閲囪喘璁㈠崟鍙�
- , "HPOOrderBillSEQ": d.data[0].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[0].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[0].濮斿璁㈠崟瀛愬唴鐮�
- , "HWWOrderBillNo": d.data[0].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[0].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[0].閲囪喘閮ㄩ棬
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[0].閫佽揣鍗曟暟閲�
- , "HReciveQty": d.data[0].鏀舵枡鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿
- , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[0].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[0].閲囪喘璁㈠崟浜よ揣鏃ユ湡),'yyyy-MM-dd')
- , "HPOOrderBillRemark": d.data[0].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[0].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HLaterReason": d.data[i].寤惰繜鍘熷洜, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[i].瑙勬牸鍨嬪彿, "HUnitID": d.data[i].HUnitID, "HUnitIDName": d.data[i].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[i].鐗╂枡灞炴��, "HQty": d.data[i].鏁伴噺, "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[i].瀛愯〃閲囪喘缁勭粐
+ , "HStatus": d.data[i].鐘舵��, "HFixleadTime": d.data[i].鎻愬墠鏈�
+ , "HDayPlanBillNo": d.data[i].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[i].婧愬崟ID, "HSourceEntryID": d.data[i].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[i].婧愬崟鍗曞彿, "HSourceBillType": d.data[i].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[i].HWorkShopID
+ , "HWorkShopIDName": d.data[i].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[i].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[i].鍙敤閲囪喘鏁伴噺
+ , "HPOOrderInterID": d.data[i].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[i].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[i].閲囪喘璁㈠崟鍙�
+ , "HPOOrderBillSEQ": d.data[i].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[i].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[i].濮斿璁㈠崟瀛愬唴鐮�
+ , "HWWOrderBillNo": d.data[i].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[i].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[i].閲囪喘閮ㄩ棬
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[i].閫佽揣鍗曟暟閲�
+ , "HReciveQty": d.data[i].鏀舵枡鏁伴噺, "HCloseStatus": d.data[i].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[i].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[i].閿�鍞鍗曞彿
+ , "HUnReciveQty": d.data[i].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[i].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[i].閲囪喘璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd')
+ , "HPOOrderBillRemark": d.data[i].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[i].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ for (var i = 0; i < d.data.length; i++) {
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub'+(i+1)).attr("checked", true);
+ }
- //鍏抽棴鐘舵��
- if (d.data[0].鍏抽棴鐘舵�� == "1") {
- $('#HCloseStatus1').attr("checked", true);
+ //鍏抽棴鐘舵��
+ if (d.data[i].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus' + (i + 1)).attr("checked", true);
+ }
+
+
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + (i + 1)).find("option[value='" + d.data[i].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ $('#HErpClsID' + (i + 1)).find("option[value='" + d.data[i].鐗╂枡灞炴�� + "']").attr("selected", true);
+ $('#HPURCHASEORGIDSub' + (i + 1)).find("option[value='" + d.data[i].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
+ $('#HStatus' + (i + 1)).find("option[value='" + d.data[i].鐘舵�� + "']").attr("selected", true);
+
}
form.render('checkbox');
-
- //寤惰繜鍘熷洜
- $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
- $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
- $('#HPURCHASEORGIDSub1').find("option[value='" + d.data[0].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
- $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
form.render('select');
}
})
@@ -972,8 +977,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
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 f972ac6..6b3a93d 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"
@@ -186,7 +186,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
//, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -398,7 +398,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝淇℃伅鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -413,7 +413,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -421,7 +420,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝淇℃伅鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
index 19ccd2f..cadb713 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_PODemandPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -145,11 +145,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -163,7 +161,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -255,7 +253,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1 ) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -410,9 +408,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
type: "GET",
@@ -426,15 +424,17 @@
, "HPRDORGID": d.data[0].缁勭粐
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[0].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
- , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
- , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HSupplierID": d.data[i].HSupplierID, "HSupplierNumber": d.data[i].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[i].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О, "HMaterModel": d.data[i].瑙勬牸鍨嬪彿
+ , "HJITMaterGroup": d.data[i].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[i].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[i].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[i].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[i].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+ , "HLeadTime": d.data[i].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[i].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[i].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[i].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- form.render('select');
}
})
}
@@ -453,8 +453,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
index 655402a..203ffc5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
@@ -180,7 +180,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
//, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -340,7 +340,7 @@
, area: ['100%', '100%']
, title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -355,7 +355,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -363,7 +362,7 @@
, area: ['100%', '100%']
, title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
index 980d784..e0d47b1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -143,11 +143,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -161,7 +159,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -241,7 +239,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -250,7 +248,9 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData()) {
+ set_AddNew(data);
+ }
});
//鐩戝惉鎻愪氦
@@ -272,7 +272,7 @@
//缁勭粐閫夋嫨椤甸潰
function get_Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -395,9 +395,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/ComplementGoodBillList",
type: "GET",
@@ -410,15 +410,16 @@
, "HInterID": d.data[0].hmainid
, "HPRDORGID": d.data[0].缁勭粐
});
-
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿浠ｇ爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HWHID": d.data[0].HWHID
- , "HWHNumber": d.data[0].浠撳簱浠ｇ爜, "HWHName": d.data[0].浠撳簱鍚嶇О, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
- option.data = rowdata;
- table.render(option);
- form.render('select');
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].杞﹂棿浠ｇ爜, "HWorkShopName": d.data[i].杞﹂棿鍚嶇О, "HWHID": d.data[i].HWHID
+ , "HWHNumber": d.data[i].浠撳簱浠ｇ爜, "HWHName": d.data[i].浠撳簱鍚嶇О, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ option.data = rowdata;
+ table.render(option);
+ }
}
})
}
@@ -437,8 +438,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';'+ OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -464,6 +464,16 @@
});
}
+ //闈炵┖楠岃瘉
+ function AllowLoadData() {
+
+ if ($("#HPRDORGID").val() == "0") {
+ layer.msg("缁勭粐娌℃湁閫夋嫨");
+ return false;
+ }
+ return true;
+ }
+
//#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/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 b905ea7..2e78e14 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"
@@ -186,7 +186,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
//, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -398,7 +398,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝淇℃伅鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -413,7 +413,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -421,7 +420,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝淇℃伅鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
index 6d6dfee..7516e6c 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_NeedMaterPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
@@ -145,16 +145,14 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '4611' },
+ data: { "HBillType": '4615' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -163,7 +161,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -255,7 +253,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -410,9 +408,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/NeedMaterPlanConfigBillList",
type: "GET",
@@ -425,16 +423,17 @@
, "HInterID": d.data[0].hmainid
, "HPRDORGID": d.data[0].缁勭粐
});
-
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿缂栫爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
- , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
- , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].杞﹂棿缂栫爜, "HWorkShopName": d.data[i].杞﹂棿鍚嶇О, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О, "HMaterModel": d.data[i].瑙勬牸鍨嬪彿
+ , "HJITMaterGroup": d.data[i].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[i].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[i].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[i].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[i].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+ , "HLeadTime": d.data[i].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[i].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[i].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[i].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- form.render('select');
}
})
}
@@ -453,8 +452,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.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 d3ea933..893e3eb 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"
@@ -69,7 +69,32 @@
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓氬姟鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
+ <option value="0" selected>鍏ㄩ儴</option>
+ <option value="璁″垝">璁″垝</option>
+ <option value="璁″垝纭">璁″垝纭</option>
+ <option value="涓嬭揪">涓嬭揪</option>
+ <option value="寮�宸�">寮�宸�</option>
+ <option value="瀹屽伐">瀹屽伐</option>
+ <option value="缁撴">缁撴</option>
+ </select>
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillType" id="HBillType">
</div>
</div>
<div class="layui-inline">
@@ -123,7 +148,27 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;">鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" selected>' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
//#endregion
@@ -196,69 +241,71 @@
, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
, { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
- , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120 }
- , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 120 }
- , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 120 }
- , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 120 }
- , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 120 }
- , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 120 }
- , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120, hide: true }
+ , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170, hide: true }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
+ , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 200 }
+ , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 200 }
+ , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 200 }
+ , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 150 }
+ , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
+ , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 150 }
+ , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 150 }
+
+ , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
+ , { field: 'HDeptID', title: 'HDeptID', hide: true}
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115, hide: true }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115, hide: true}
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160, hide: true}
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160, hide: true}
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215, hide: true}
, { field: 'hunitid', title: 'hunitid', hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115, hide: true}
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', hide: true}
, { field: 'hempid', title: 'hempid' , hide: true}
- , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100 }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
- , { field: 'hcusid', title: 'hcusid' }
- , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜' }
- , { field: '瀹㈡埛', title: '瀹㈡埛' }
+ , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', hide: true}
+ , { field: 'hcusid', title: 'hcusid', hide: true }
+ , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', hide: true }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', hide: true }
, { field: 'HCenterID', title: 'HCenterID' , hide: true}
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', hide: true}
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', hide: true}
, { field: 'hbomid', title: 'hbomid' , hide: true}
- , { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�' }
+ , { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�', hide: true }
, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
- , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜' }
- , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎' }
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
- , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�' }
- , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�' }
- , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
- , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
- , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', hide: true }
+ , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎', hide: true}
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', hide: true}
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', hide: true}
+ , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', hide: true}
+ , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', hide: true}
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', hide: true}
+ , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺', hide: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', hide: true}
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�', hide: true}
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', hide: true}
, { field: 'hsubid', title: 'hsubid' , hide: true}
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true}
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', hide: true}
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', hide: true}
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', hide: true}
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', hide: true }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', hide: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', hide: true}
+ , { field: '淇敼浜�', title: '淇敼浜�', hide: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', hide: true}
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', hide: true}
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', hide: true }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true}
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', hide: true}
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', hide: true}
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true}
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true}
]]
};
}
@@ -296,8 +343,10 @@
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
- var HDeptName = $("#HDeptName").val();//鍗曟嵁鍙�
var HMaterName = $("#HMaterName").val();//鍗曟嵁鍙�
+ var HDeptName = $("#HDeptName").val();//鍗曟嵁鍙�
+ var HStatus = $("#HStatus").val();//鍗曟嵁鍙�
+ var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
if (HDate) {
sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
}
@@ -310,11 +359,17 @@
if (WorkCenter) {
sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
}
- if (HDeptName) {
- sWhere += " and 鐢熶骇杞﹂棿 like '%" + HDeptName + "%'";
- }
if (HMaterName) {
sWhere += " and 浜у搧浠ｇ爜 like '%" + HMaterName + "%'";
+ }
+ if (HDeptName && HDeptName!=0) {
+ sWhere += " and HDeptID = " + HDeptName ;
+ }
+ if (HStatus && HStatus != 0) {
+ sWhere += " and 涓氬姟鐘舵�� like '%" + HStatus + "%'";
+ }
+ if (HBillType) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HBillType + "%'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -329,6 +384,8 @@
$("#WorkCenter").val("");//鍗曟嵁鍙�
$("#HDeptName").val("");//鍗曟嵁鍙�
$("#HMaterName").val("");//鍗曟嵁鍙�
+ $("#HDeptName").val("");//鍗曟嵁鍙�
+ $("#HStatus").val("");//鍗曟嵁鍙�
$("#btnSearch").click();
sWhere = "";
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
index cbf8f83..9deb464 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
@@ -154,7 +154,6 @@
<div class="layui-form-item" style="padding-top: 10px;">
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
-
</div>
</div>
</form>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index a479d5e..3f766d1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -272,6 +272,8 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
+ <input type="text" class="layui-input" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden>
+ <input type="text" class="layui-input" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden>
</div>
</div>
<div class="layui-inline">
@@ -582,11 +584,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -601,7 +601,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -1191,7 +1191,7 @@
if (table.cache["mainTable"][i] != "") {
//鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
if (table.cache["mainTable"][i].HEntryCloseDate == "") {
- table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01 00:00:00.000"
+ table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01"
}
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
@@ -1201,8 +1201,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -1229,15 +1228,14 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (d) {
-
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": d.data[0].鍗曟嵁鍙�
@@ -1275,6 +1273,8 @@
, "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�濮嬫棩鏈�), "yyyy-MM-dd")
, "HPlanEndDate":Format(new Date(d.data[0].璁″垝缁撴潫鏃ユ湡), "yyyy-MM-dd")
, "HICMOBillNo": d.data[0].鐢熶骇璁㈠崟鍙�
+ , "HMainSourceInterID": d.data[0].婧愬崟涓诲唴鐮�
+ , "HMainSourceEntryID": d.data[0].婧愬崟瀛愬唴鐮�
, "HOwnerID": d.data[0].璐т富缂栫爜
, "HBatchNo": d.data[0].鎵规
, "HYX": d.data[0].浼樺厛绾�
@@ -1293,7 +1293,7 @@
, "HSourceBillNo": d.data[0].婧愬崟缂栧彿
, "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟鏄庣粏鍐呯爜
, "HMainInterID": d.data[0].瀵煎叆鎺掍骇ID
- , "HProdORGID": d.data[0].鐢熶骇缁勭粐
+ , "HProdORGID": d.data[0].HProdORGID
, "HLeftPlanQty": d.data[0].鏈帓鏁伴噺
, "HEmpID": d.data[0].HEmpID
, "HEmpIDName": d.data[0].鑱屽憳
@@ -1309,15 +1309,17 @@
, "HHangUp": d.data[0].鎸傝捣鏍囪 == "0" ? false : true
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HMasterDate": Format(new Date(d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
- , "HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[0].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[0].缁撴潫鏃堕棿), "yyyy-MM-dd")
- , "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[0].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate":Format(new Date(d.data[0].瀛愬叧闂椂闂�), "yyyy-MM-dd")
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": d.data[0].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[0].鏄惁榻愬
- , "HStatusTag": d.data[0].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[0].鎵嬪伐淇敼鏍囪 == 0 ? false : true
- }];
-
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ rowdata.push({
+ "HMasterDate": Format(new Date(d.data[i].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[i].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[i].姹囨姤瀹屾垚鏁伴噺
+ , "HTimes": d.data[i].鍓╀綑宸ユ椂, "HUseTimes": d.data[i].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[i].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[i].缁撴潫鏃堕棿), "yyyy-MM-dd")
+ , "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[i].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), "yyyy-MM-dd")
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[i].Excel鍒楀ご, "HLockedSub": d.data[i].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[i].鏄惁榻愬
+ , "HStatusTag": d.data[i].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[i].鎵嬪伐淇敼鏍囪 == 0 ? false : true
+ });
+ }
option.data = rowdata;
table.render(option);
@@ -1329,25 +1331,27 @@
if (d.data[0].鎸傝捣鏍囪 == "1") {
$("#checkboxHHangUp").attr("checked", true);
}
+ for (var i = 0; i < d.data.length; i++) {
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
+ }
- //閿佸畾鏍囪
- if (d.data[0].瀛愰攣瀹氭爣璁� == "1") {
- $('#HLockedSub1').attr("checked", true);
- }
+ //閿佸畾鏍囪
+ if (d.data[i].瀛愰攣瀹氭爣璁� == "1") {
+ $('#HLockedSub' + (i + 1)).attr("checked", true);
+ }
- //鐘舵�佹爣璁�
- if (d.data[0].鐘舵�佹爣璁� == "1") {
- $('#HStatusTag1').attr("checked", true);
- }
+ //鐘舵�佹爣璁�
+ if (d.data[i].鐘舵�佹爣璁� == "1") {
+ $('#HStatusTag' + (i + 1)).attr("checked", true);
+ }
- //鎵嬪伐淇敼鏍囪
- if (d.data[0].鎵嬪伐淇敼鏍囪 == "1") {
- $('#HIsHandModify1').attr("checked", true);
+ //鎵嬪伐淇敼鏍囪
+ if (d.data[i].鎵嬪伐淇敼鏍囪 == "1") {
+ $('#HIsHandModify' + (i + 1)).attr("checked", true);
+ }
}
form.render('checkbox');
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index 89dc3c5..cee9a13 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -58,7 +58,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
@@ -170,7 +170,7 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
@@ -216,7 +216,7 @@
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -401,7 +401,7 @@
, area: ['100%', '100%']
, title: '鏃ヨ鍒掑伐鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -416,7 +416,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -424,7 +423,7 @@
, area: ['100%', '100%']
, title: '鏃ヨ鍒掑伐鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackedBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackedBillList.html"
index 7dd89d6..3d63540 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackedBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackedBillList.html"
@@ -127,7 +127,7 @@
//鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
table.on('row(mainTable)', function (obj) {
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
- var HBarCode = datas.HBarCode;
+ var HBarCode = datas.hmainid;
$.ajax({
url: GetWEBURL() + 'Sc_ICMOBillController/QK_GetPackingBillListByMainID',
type: "GET",
@@ -314,7 +314,6 @@
layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹墦鍗帮紒');
}
}
-
//鎵撳嵃
function get_PrintReport() {
var checkStatus = table.checkStatus('mainTable')
@@ -347,11 +346,11 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
var cache=table.cache['mainTable1']
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 0) {
var HInterID = data[0].hmainid.toString();
- if (cache.length!=0) {
- flag = 1;
- }
+ //if (cache.length!=0) {
+ // flag = 1;
+ //}
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
index 7dafa50..0714f30 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
@@ -37,7 +37,7 @@
<input type="text" name="HBillNo1" id="HBillNo1" style="display:none">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">鏁磋鐢熸垚</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">鏉＄爜鐢熸垚</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</button>
</div>
</div>
@@ -110,16 +110,20 @@
//鏁寸鐢熸垚
form.on('submit(btnPack)', function (data) {
var flag = "ZZ";
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- SavePack(flag, sSubStr);
+ var sSubStr = table.checkStatus('mainTable');
+ if (sSubStr.data.length > 0) {
+ SavePack(flag,sSubStr);
+ }
+ else {
+ layer.msg('璇锋渶灏戦�夋嫨1琛屾暟鎹紒');
+ return;
+ }
});
//鎷肩鐢熸垚
form.on('submit(btnAssembly)', function (data) {
var flag = "PZ";
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length > 1) {
- var sSubStr = JSON.stringify(table.checkStatus('mainTable').data);
+ var sSubStr = table.checkStatus('mainTable');
+ if (sSubStr.data.length > 1) {
SavePack(flag,sSubStr);
}
else {
@@ -156,7 +160,9 @@
function set_InitGrid() {
columns = [
{ type: 'checkbox', fixed: 'left' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text', width: 100, hide: true }
, { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', edit: 'text', width: 100, hide: true }
, { field: 'HBillNo', title: 'HBillNo', edit: 'text', width: 100, hide: true }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterNumber', title: 'HMaterNumber', edit: 'text', width: 100, hide: true }
@@ -168,6 +174,16 @@
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', event: 'HMinQty', width: 100 }
, { field: 'HTotalQty', title: '鐢熸垚鏉℃暟', edit: 'false', width: 100 }
, { field: 'HSpsQty', title: '鍓╀綑鏁伴噺', edit: 'false', width: 100 }
+ , { field: 'HXH', title: '绠卞彿', edit: 'false', width: 100 }
+
+ , { field: 'FBillNo', title: '閿�鍞鍗曞彿', edit: 'false', width: 100 }
+ , { field: 'FLXName', title: '鑱旂郴浜�', edit: 'text', width: 100 }
+ , { field: 'FInAddress', title: '鏀惰揣鏂瑰湴鍧�', edit: 'false', width: 100 }
+ , { field: 'FMaterName', title: '閿�鍞墿鏂欏悕绉�', edit: 'false', width: 100 }
+ , { field: 'FBZFS', title: '鍖呰鏂瑰紡', edit: 'false', width: 100 }
+ , { field: 'FHX', title: '鑺卞瀷', edit: 'false', width: 100 }
+ , { field: 'FQK', title: '澧欏挃缂�', edit: 'false', width: 100 }
+ , { field: 'FWBBZ', title: '澶栧寘澶囨敞', edit: 'false', width: 100 }
, { field: 'HCusID', title: 'HCusID', edit: 'text', width: 100, hide: true }
, { field: 'HCusName', title: '瀹㈡埛', edit: 'false', width: 100 }
@@ -195,7 +211,7 @@
table.render(option);
}
//鐢熸垚
- function SavePack(flag, sSubStr) {
+ function SavePack(flag,sSubStr) {
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
return false;
@@ -205,13 +221,22 @@
type: "POST",
url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + sessionStorage["OrganizationID"]},
+ data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + flag + ";" + $('#HBillNo').val()},
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- set_InitGrid();//閲嶆柊鍔犺浇琛ㄦ牸
- });
+ var PrintIds = data.code;
+ PrintIds = PrintIds.substring(0, PrintIds.length - 1);
+ var Type = "HQKPackBill";
+ var OpenTmp = "";
+ if (sSubStr.data[0].FBZFS == "" && (sSubStr.data[0].FHX != "" || sSubStr.data[0].FMaterName != "")) {
+ OpenTmp = "鑺卞瀷鏉＄爜";
+ }
+ else {
+ OpenTmp = "鍖呰鏂瑰紡鏉＄爜";
+ }
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
}
else {
f_alert(data.Message);
@@ -222,7 +247,6 @@
error: function (err) {
f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
}
});
}
@@ -231,12 +255,15 @@
function AllowLoadData(sSubStr) {
var Result = true;
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
- sSubStr = JSON.parse(sSubStr);
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HMinQty == "") {
+ for (var i = 0; i < sSubStr.data.length; i++) {
+ if (sSubStr.data[i].HMinQty == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈�灏忓寘瑁呮暟涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (sSubStr.data[i].HXH == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,绠卞彿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
new file mode 100644
index 0000000..450ff51
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -0,0 +1,596 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢熶骇璁″垝骞冲彴</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.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 style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel瀵煎叆</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ </div>
+ <div class="layui-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="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">寮�宸ユ埅姝㈡棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">棰勭暀鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <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="HICMOBillNo" id="HICMOBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="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; width: 185px;">
+ <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
+ <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <option value="鏍囧噯Bom">鏍囧噯Bom</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;margin-bottom:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閿佸畾澶╂暟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ //#region 鍏敤鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , excel = layui.excel
+ , element = layui.element;
+
+ var sWhere = "";
+ var option = [];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //琛屽唴榧犳爣绂诲紑浜嬩欢
+ table.on('edit(mainTable)', function (obj) {
+ var myDate = new Date();
+ var yyyy = myDate.getFullYear();
+ var MM = myDate.getMonth() + 1;
+ var dd = myDate.getDate();
+ var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+ var dateHQty = 0;
+
+ for (var i = 0; i <= (SumMonth - dd); i++) {
+ if (obj.field == "鐢熶骇璧勬簮") {
+ return;
+ }
+ if (obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')] != null) {
+ dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
+ }
+ }
+ for (var i = 1; i < dd; i++) {
+ if (obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')] != null) {
+ dateHQty += parseInt(obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')]);
+ }
+ }
+ console.log(dateHQty)
+ //淇敼鏁版嵁
+ obj.update({
+ "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
+ });
+ })
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ switch (obj.event) {
+ case 'btn-CopyLine':
+ console.log(JSON.stringify(data))
+ console.log()
+
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ data[0]["鐢熶骇璧勬簮"] = "";
+ data[0]["HSourceID"] = "";
+ data[0]["hmainid"] = "";
+ data[0]["鍗曟嵁鍙�"] = "";
+ var copydata = JSON.stringify(data);
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ break;
+ }
+ });
+
+ //瀵煎叆
+ form.on('submit(ExcelImport)', function () {
+ btnExcelImport();
+ });
+
+ //淇濆瓨
+ form.on('submit(btnSave)', function (data) {
+ set_AddNew(data);
+ });
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {
+ btnHMaterID();
+ });
+
+ //鐢熶骇杞﹂棿
+ form.on('submit(btnHWorkShopID)', function (data) {
+ btnHWorkShopID();
+ });
+
+ //蹇�熻繃婊�
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //缁勭粐
+ Organ();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ get_FastQuery();
+ }
+ //#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ 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>';
+ }
+ $("#HProdORGID").append(Organization);
+ $("#HProdORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //琛ㄦ牸鏁版嵁
+ function set_InitGrid() {
+ var columns = [];
+ var myDate = new Date();
+ var yyyy = myDate.getFullYear();
+ var MM = myDate.getMonth() + 1;
+ var dd = myDate.getDate();
+ var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+
+ columns.push({ type: 'checkbox', fixed: 'left' });
+ columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width:150 });
+ columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width:150 });
+ columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
+ columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150 });
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width:150 });
+ columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width:150 });
+ columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+ columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width:150 });
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width:150 });
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width:150 });
+ columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true});
+ columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width:150 });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width:150 });//0
+ columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150 });//0
+ columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width:150 });
+ columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
+ columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
+ columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150 });//0
+ columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
+ columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width:150 });
+ columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+ columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150});
+ columns.push({ field: 'HSourceID', title: 'HSourceID', hide:true });
+ columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
+ for (var i = 0; i <= (SumMonth - dd); i++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width: 70 })//0
+ }
+ for (var i = 1; i < dd; i++) {
+ columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 70 })//0
+ }
+ columns.push({ field: 'T31', title: 'T31', width: 70 });//0
+ columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
+ columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150 });
+ columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150 });
+ columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150 });
+ columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150 });
+ columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150 });
+ columns.push({ field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 150 });
+ columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
+ columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
+ columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150 });
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [columns]
+ };
+ }
+
+ //鏌ヨ鍔犺浇鏁版嵁
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ 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 });
+ }
+ });
+ }
+
+ //Excel瀵煎叆
+ function btnExcelImport() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: 'Excel瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html?OperationType=1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ //鐗╂枡鍒楄〃
+ function btnHMaterID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterModel").val(checkStatus.data[0].HModel);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+
+ }
+
+ //鐢熶骇杞﹂棿鍒楄〃
+ function btnHWorkShopID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+ $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HPlanBeginDate = $("#HPlanBeginDate").val();//寮�宸ヨ捣濮嬫棩鏈�
+ var HProdORGID = $("#HProdORGID").val();//鐢熶骇璁㈠崟缁勭粐
+ var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
+ var HPlanEndDate = $("#HPlanEndDate").val();//寮�宸ユ埅姝㈡棩鏈�
+ var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
+ var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
+ var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+
+ sWhere = {
+ HPlanBeginDate: HPlanBeginDate
+ , HProdORGID: HProdORGID
+ , HSeOrderBillNo: HSeOrderBillNo
+ , HPlanEndDate: HPlanEndDate
+ , HMaterID: HMaterID
+ , HICMOBillNo: HICMOBillNo
+ , HWorkShopID: HWorkShopID
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //閲嶇疆
+ function set_ClearQuery() {
+ $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
+ $("#HProdORGID").val("0");//鐢熶骇璁㈠崟缁勭粐
+ $("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
+ $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
+ $("#HMaterID").val("0");//鐗╂枡缂栫爜id
+ $("#HMaterNumber").val("");//鐗╂枡缂栫爜
+ $("#HMaterName").val("");//鐗╂枡鍚嶇О
+ $("#HMaterModel").val("0");//瑙勬牸鍨嬪彿
+ $("#HICMOBillNo").val("");//鐢熶骇璁㈠崟鍙�
+ $("#HWorkShopID").val("0");//鐢熶骇杞﹂棿id
+ $("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
+ sWhere = "";
+ }
+
+ //淇濆瓨
+ function set_AddNew(data) {
+
+ //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ //var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr +";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ get_FastQuery();
+ layer.close(index);
+ layer.msg("淇濆瓨鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //琛屽唴蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鐢熶骇璧勬簮
+ if (obj.event == "HSourceID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": checkStatus.data[0].HItemID
+ , "鐢熶骇璧勬簮": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+
+ })
+ }
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
new file mode 100644
index 0000000..f62154c
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -0,0 +1,374 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢熶骇鏃ヨ鍒掑鍏�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁㈠崟绫诲瀷</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
+ <option value="鐢熶骇璁㈠崟">鐢熶骇璁㈠崟</option>
+ <option value="濮斿璁㈠崟">濮斿璁㈠崟</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></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', 'upload'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , excel = layui.excel
+ , upload = layui.upload
+ , element = layui.element;
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj);//琛屽唴蹇嵎閿瓫閫�
+ });
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_DR',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ before: function (data) {
+ loadIndex = layer.load(2);
+ },
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(loadIndex);
+ } else {
+ layer.close(loadIndex);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ if (OperationType == 1) {
+ Pub_Close(1);
+ }
+ else {
+ Pub_Close(2);
+ }
+ })
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+
+ //#endregion
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ var myDate = new Date();
+ var yyyy = myDate.getFullYear();
+ var MM = myDate.getMonth() + 1;
+ var dd = myDate.getDate();
+ var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+ var columns = [];
+
+ columns.push({ type: 'checkbox', fixed: 'left' });
+ columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
+ columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 });
+ columns.push({ field: '鐢熶骇璁㈠崟鍙�*', title: '鐢熶骇璁㈠崟鍙�' });
+ columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿*', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 200 });
+ columns.push({ field: '缁勭粐缂栫爜*', title: '缁勭粐缂栫爜' });
+ columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+ columns.push({ field: '鐢熶骇杞﹂棿缂栫爜*', title: '鐢熶骇杞﹂棿' });
+ columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
+ columns.push({ field: '鐢熶骇璧勬簮缂栫爜*', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" });
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�' });
+ columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
+ columns.push({ field: '鍛樺伐', title: '鍛樺伐' });
+ columns.push({ field: '鍛樺伐缂栫爜', title: '鍛樺伐缂栫爜' });
+ columns.push({ field: 'HMaterID', title: '鐗╂枡ID', hide: true });
+ columns.push({ field: '鐗╂枡缂栫爜*', title: '鐗╂枡缂栫爜' });
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 });
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' });
+ columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
+ columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' });
+ columns.push({ field: '鎵规鍙�', title: '鎵规' });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 200 });
+ columns.push({ field: '鐢熶骇璁㈠崟鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 200 });
+ columns.push({ field: '鎬婚綈濂楁暟閲�', title: '鎬婚綈濂楁暟閲�', width: 200 });
+ columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
+ columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
+ for (var i = 0; i <= (SumMonth - dd); i++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:60 })
+ }
+ for (var i = 1; i < dd; i++) {
+ columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 60 })
+ }
+ columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-190'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [columns]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+ data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ });
+ }
+ }
+
+ //琛屽唴鍒犻櫎蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鐢熶骇璧勬簮
+ if (obj.event == "HSourceID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": checkStatus.data[0].HItemID
+ , "鐢熶骇璧勬簮缂栫爜*": checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
index 92e5ee6..6bff735 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -276,11 +276,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -295,7 +293,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -631,7 +629,6 @@
//澶氶�� 鍒锋柊琛ㄦ牸
function checkRefresh() {
for (var i = 1; i <= option.data.length; i++) {
- console.log(JSON.stringify(option.data[i - 1]))
//寤惰繜鍘熷洜
$('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
//鐗╂枡灞炴��
@@ -838,9 +835,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
type: "GET",
@@ -862,44 +859,52 @@
, "HExplanation": d.data[0].鎽樿
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
- , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HProdORGID": d.data[0].瀛愮敓浜х粍缁�
- , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
- , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd')
- , "HRelationQty": d.data[0].鍏宠仈鏁伴噺, "HICMOInterID": d.data[0].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟瀛愬唴鐮�
- , "HICMOBillSEQ": d.data[0].鐢熶骇璁㈠崟琛屽彿, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd')
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HReciveQty": d.data[0].鍏ュ簱鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false
- , "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿, "HICMOEmpID": d.data[0].HICMOEmpID, "HICMOEmpIDName": d.data[0].鐢熶骇璁㈠崟鍒跺崟浜�
- , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HICMOBillDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd')
- , "HICMOBillDeliveryDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[0].鐢熶骇璁㈠崟鎽樿
- , "HICMOBillNote": d.data[0].鐢熶骇璁㈠崟琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HLaterReason": d.data[i].寤惰繜鍘熷洜, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[i].瑙勬牸鍨嬪彿, "HUnitID": d.data[i].HUnitID, "HUnitIDName": d.data[i].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[i].鐗╂枡灞炴��, "HQty": d.data[i].鏁伴噺, "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HProdORGID": d.data[i].瀛愮敓浜х粍缁�
+ , "HStatus": d.data[i].鐘舵��, "HFixleadTime": d.data[i].鎻愬墠鏈�, "HSourceInterID": d.data[i].婧愬崟ID, "HSourceEntryID": d.data[i].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[i].婧愬崟鍗曞彿, "HSourceBillType": d.data[i].瀛愭簮鍗曠被鍨�, "HDayPlanDate": Format(new Date(d.data[i].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd')
+ , "HRelationQty": d.data[i].鍏宠仈鏁伴噺, "HICMOInterID": d.data[i].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": d.data[i].鐢熶骇璁㈠崟瀛愬唴鐮�
+ , "HICMOBillSEQ": d.data[i].鐢熶骇璁㈠崟琛屽彿, "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), 'yyyy-MM-dd')
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HReciveQty": d.data[i].鍏ュ簱鏁伴噺, "HCloseStatus": d.data[i].鍏抽棴鐘舵�� == "1" ? true : false
+ , "HRemoveQty": d.data[i].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[i].閿�鍞鍗曞彿, "HICMOEmpID": d.data[i].HICMOEmpID, "HICMOEmpIDName": d.data[i].鐢熶骇璁㈠崟鍒跺崟浜�
+ , "HUnReciveQty": d.data[i].鏈敹鏂欐暟閲�, "HICMOBillDate": Format(new Date(d.data[i].鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd')
+ , "HICMOBillDeliveryDate": Format(new Date(d.data[i].鐢熶骇璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[i].鐢熶骇璁㈠崟鎽樿
+ , "HICMOBillNote": d.data[i].鐢熶骇璁㈠崟琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ for (var i = 0; i < d.data.length; i++) {
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
+ }
- //鍏抽棴鐘舵��
- if (d.data[0].鍏抽棴鐘舵�� == "1") {
- $('#HCloseStatus1').attr("checked", true);
- }
- form.render('checkbox');
+ //鍏抽棴鐘舵��
+ if (d.data[i].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus' + (i + 1)).attr("checked", true);
+ }
- //寤惰繜鍘熷洜
- $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
- //鐗╂枡灞炴��
- $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
- //鐢熶骇缁勭粐
- $('#HProdORGIDSub1').find("option[value='" + d.data[0].瀛愮敓浜х粍缁� + "']").attr("selected", true);
- //鐘舵��
- $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + (i + 1)).find("option[value='" + d.data[i].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ //鐗╂枡灞炴��
+ $('#HErpClsID' + (i + 1)).find("option[value='" + d.data[i].鐗╂枡灞炴�� + "']").attr("selected", true);
+ //鐢熶骇缁勭粐
+ $('#HProdORGIDSub' + (i + 1)).find("option[value='" + d.data[i].瀛愮敓浜х粍缁� + "']").attr("selected", true);
+ //鐘舵��
+ $('#HStatus' + (i + 1)).find("option[value='" + d.data[i].鐘舵�� + "']").attr("selected", true);
+ }
form.render('select');
+ form.render('checkbox');
+
+
+
}
})
}
@@ -923,8 +928,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index 1ac8e71..3163db1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -172,7 +172,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '瑕佹枡鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -391,7 +391,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -406,7 +406,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -414,7 +413,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
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 c523195..53cb11a 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"
@@ -465,7 +465,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- data: { "sWhere": " and hmainid = " + linterid },
+ data: { "sWhere": " and hmainid = " + linterid, "user": sessionStorage["HUserName"]},
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
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 60a2555..f60cf07 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"
@@ -412,11 +412,11 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/get_Display',
type: "GET",
- data: { "sWhere": "and HInterID = " + linterid },
+ data: { "sWhere": "and HInterID = " + linterid, "user": sessionStorage["HUserName"]},
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
- $("#HProcExchBillNo").val(data.宸ュ簭娴佽浆鍗″彿);
+ $("#HProcExchBillNo").val(data.娴佽浆鍗″彿);
$("#HProcExchInterID").val(data.HProcExchInterID);
$("#HProcExchEntryID").val(data.HProcExchEntryID);
$("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
index 3d7172c..36e8707 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
@@ -158,7 +158,7 @@
//#endregion
//#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index d60df77..581dd68 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -91,7 +91,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></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-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
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.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.html"
index 57a41a2..e30b47d 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_ProcessExchangeBill.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.html"
@@ -317,7 +317,7 @@
<input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
+ <!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">娴佽浆鍗＄被鍨�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
@@ -326,7 +326,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
</div>
</div>
@@ -344,6 +344,8 @@
<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="HSeOrderBillNo" id="HSeOrderBillNo">
+ <input type="hidden" class="layui-input" name="HSeOrderEntryID" id="HSeOrderEntryID">
+ <input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">
</div>
</div>
<div class="layui-inline">
@@ -577,7 +579,7 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
-
+ var option;
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -595,6 +597,12 @@
var HEntryID=params[params[2]];//婧愬崟瀛恑d
var HSouceBillType = params[params[3]];//婧愬崟绫诲瀷
}
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$.ajax({
@@ -610,6 +618,16 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
+ option.data = [{
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ }];
+ table.render(option);
}
else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -627,42 +645,33 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
- GetICMOBillValue(linterid, HEntryID)
+ GetICMOBillValue(linterid, HEntryID);
+ option.data = [{
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0,"HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ }];
+ table.render(option);
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
- $("#HEntryID").val(HEntryID);//淇敼鏃朵富琛↖D
- //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
- }
- else if (OperationType == 4) {//娴忚
- $("#HItemID").val(linterid);//
- $("#HEntryID").val(HEntryID);//
- //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- RoadBillMain(linterid);
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ set_EditFromGrid();
+
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
+ //#endregion
+
- //鍒濆琛ㄦ牸鏁版嵁
- var rowdata = [{
- "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "鍔犲伐璇存槑": "",
- "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
- "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
- "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
- "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
- "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
- }];
-
- var option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , height: 'full-50'
- , cellMinWidth: 110
- , cols: [[ //琛ㄥご
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
@@ -671,75 +680,75 @@
, { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
, { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
, { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績鍚嶇О' }
+ , { field: 'HCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
+ , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
+ , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+ , { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
+ , { field: 'HDeptName', title: '閮ㄩ棬' }
, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
+ , { field: 'HSupName', title: '渚涘簲鍟�' }
, { field: 'isEntrust', title: '鏄惁濮斿', templet: '#isEntrust' }
- , { field: 'HQty', title: '娴佽浆鍗℃暟閲�', edit: 'text' }
- , { field: '鍔犲伐鍗曚綅', title: '鍔犲伐鍗曚綅', edit: 'text' }
+ , { field: 'HQty', title: '娴佹按鍗℃暟閲�', edit: 'text' }
+ , { field: 'HOutPrice', title: '鍔犲伐鍗曚环', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: '琛屽彿', title: '琛屽彿', edit: 'text' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', edit: 'text' }
- , { field: '濮斿宸ュ崟鏁伴噺', title: '濮斿宸ュ崟鏁伴噺', edit: 'text' }
- , { field: '涓嶅悎鏍兼暟閲�', title: '涓嶅悎鏍兼暟閲�', edit: 'text' }
- , { field: '瓒呴姣斾緥', title: '瓒呴姣斾緥', edit: 'text' }
- , { field: '鏈�楂樹笂闄�', title: '鏈�楂樹笂闄�', edit: 'text' }
- , { field: 'isEdit', title: '涓嶅彲缂栬緫', event: "isEditCheck" }
- , { field: 'isEditValue', title: '涓嶅彲缂栬緫鍊�', hide: true }
- , { field: '鑹巼', title: '鑹巼', edit: 'text' }
- , { field: '绱鑹巼', title: '绱鑹巼', edit: 'text' }
+ , { field: 'HRelationQty_In', title: '杩涚珯鏁伴噺', edit: 'text' }
+ , { field: 'HRelationQty_Out', title: '鍑虹珯鏁伴噺', edit: 'text' }
+ , { field: 'HRelationQty_WWOrder', title: '濮斿宸ュ崟鏁伴噺', edit: 'text' }
+ , { field: 'HRelationQty_Bad', title: '涓嶅悎鏍兼暟閲�', edit: 'text' }
+ , { field: 'HOverRate', title: '瓒呴姣斾緥', edit: 'text', event: "HOverRate" }
+ , { field: 'HMaxQty', title: '鏈�楂樹笂闄�', edit: 'text', edit: 'false', }
+ , { field: 'HPassRate', title: '鑹巼', edit: 'text' }
+ , { field: 'HSumPassRate', title: '绱鑹巼', edit: 'text' }
, { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text', width: 500 }
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width:1200 }
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width: 1200 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
- ]]
- , done: function (res, curr, count) {
- option.data = res.data;
- //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
- $('.layui-form-select').find('input').unbind("blur");
- //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
- $('tr').each(function (e) {
- var $cr = $(this);
- var dataIndex = $cr.attr("data-index");
- $.each(option.data, function (index, value) {
- if (value.LAY_TNDEX == dataIndex) {
- $cr.find('input').val(value.isEntrust);
- }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.isEntrust);
+ }
+ });
});
- });
- }
- , text: {
- none: '鏃犳暟鎹紒'
- }
- };
- //鍒濆鍔犺浇琛ㄦ牸
- option.data = rowdata;
- table.render(option);
+ }
+ , done: function (res, curr, count) {
- //鏄惁榛樿宸ヨ壓
- //form.on('checkbox(HBLFlag)', function (data) {
- // $("#HBLFlag").val(data.elem.checked);
- //});
- //鏄惁鍚敤
- form.on('checkbox(checkboxHUseFlag)', function (data) {
- $("#HUseFlag").val(data.elem.checked);
- });
+ }
+ };
+ }
+
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
- var NewRow = {
- "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "鍔犲伐璇存槑": "",
- "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
- "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
- "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
- "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
- "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
+ var NewRow ={
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -791,6 +800,7 @@
}
});
}
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == 'HProcCheck') {
@@ -816,6 +826,7 @@
, HProcID: checkStatus.data[0].HItemID
, HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
});
+
layer.close(layer.index);
}
, btn2: function (index, layero) {
@@ -844,9 +855,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- 宸ヤ綔涓績: checkStatus.data[0].宸ヤ綔涓績
+ HCenterName: checkStatus.data[0].宸ヤ綔涓績
, HCenterID: checkStatus.data[0].HItemID
- , 宸ヤ綔涓績浠ｇ爜: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+ , HCenterNumber: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
});
layer.close(layer.index);
}
@@ -876,9 +887,41 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- 渚涘簲鍟�: checkStatus.data[0].HName
+ HSupName: checkStatus.data[0].HName
, HSupID: checkStatus.data[0].HItemID
- , 渚涘簲鍟嗕唬鐮�: checkStatus.data[0].HNumber
+ , HSupNumber: checkStatus.data[0].HNumber
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HDeptCheck') {//閮ㄩ棬
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '渚涘簲鍟嗗垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HDeptName: checkStatus.data[0].HName
+ , HDeptID: checkStatus.data[0].HItemID
+ , HDeptNumber: checkStatus.data[0].HNumber
});
layer.close(layer.index);
}
@@ -916,98 +959,29 @@
}
});
- $('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
- if (event.keyCode == 118) {
- layer.msg("宸ヨ壓璺嚎鍚嶇ОF7鎸夐挳")
- }
- });
+ //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ //绗竴琛岃鍒掓暟閲�=娴佽浆鍗℃暟閲忥紱涔嬪悗鐨勮鍒掓暟閲�=涓婁竴琛屾暟閲�*鑹巼/ 100
+ //鏈�楂樹笂闄�=娴佽浆鍗℃暟閲�*(100+瓒呴姣斾緥)/100
+
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
- //淇濆瓨鎻愪氦
- form.on('submit(btnSave)', function (data) {//鎻愪氦
- if ($("#HICMOInterID").val() == 0) {
- layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
+ switch (field) {
+ case "HOverRate":
+ var HQty = parseInt(isNaN(data.HQty) ? 0 : data.HQty);
+ var HOverRate = parseFloat(isNaN(data.HOverRate) ? 0 : data.HOverRate);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaxQty: HQty * (100 + HOverRate)/100 //鏈�灏忓寘瑁呮暟
+ });
+ break;
+ default:
}
- if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
- layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HPlanBeginDate").val()) {
- layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HPlanEndDate").val()) {
- layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- var sSubTable = table.cache['mainTable'];
- for (var i = 0; i < sSubTable.length; i++) {
- if (!sSubTable[i].HProcNo) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (sSubTable[i].HProcNo == 0) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!sSubTable[i].HProcID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!sSubTable[i].HCenterID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (sSubTable[i].isEntrust == "true") {
- if (!sSubTable[i].HSupID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- }
- }
- data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
- var HBLFlag = document.getElementById("HBLFlag").checked;
- HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
- async: true,
- data: { "sMainSub": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- $('#set_SaveBill').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: "娓╅Θ鎻愮ず" });
- }
- });
});
@@ -1089,7 +1063,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipMentName").val(checkStatus.data[0].HName);
- $("#HEquipMentID").val(checkStatus.data[0].HItemID);
+ $("#HEquipMentID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1181,23 +1155,6 @@
});
});
- //閫夋嫨涓嶈壇鍘熷洜
- form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
//閫夋嫨鐢熶骇浠诲姟鍗�
form.on('submit(btnSearchICMOBill)', function () {
layer.open({
@@ -1214,90 +1171,260 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- GetICMOBillValue(checkStatus.data[0].hmainid)
+ GetICMOBillValue(checkStatus.data[0].hmainid, checkStatus.data[0].HEntryID)
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
});
- //閫夋嫨璐ｄ换浜�
- form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
- //閫夋嫨鐢宠宸ュ簭
- form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
- //閫夋嫨璐ｄ换宸ュ簭
- form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ if ($("#HICMOInterID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
+ layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HPlanBeginDate").val()) {
+ layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HPlanEndDate").val()) {
+ layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ var sSubTable = table.cache['mainTable'];
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (!sSubTable[i].HProcNo) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
}
- })
- });
-
- //缂栬緫
- form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ if (sSubTable[i].HProcNo == 0) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
}
- })
- // }
+ if (!sSubTable[i].HProcID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!sSubTable[i].HCenterID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (sSubTable[i].isEntrust == "true") {
+ if (!sSubTable[i].HSupID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+ }
+ data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var HBLFlag = document.getElementById("HBLFlag").checked;
+ HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var flag = "xz";
+ if (OperationType == 3) {
+ flag = "xg";
+ }
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag;
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#set_SaveBill').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: "娓╅Θ鎻愮ず" });
+ }
+ });
});
-
+ //閫�鍑�
form.on('submit(Cancel)', function () {
- if (OperationType == 1) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
Pub_Close(2);
- } else if (OperationType == 2) {
+ }
+ else {
+ //鍏抽棴椤电
Pub_Close(1);
}
})
+
+ //缂栬緫鏂规硶
+ function set_EditFromGrid() {
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+ option.data = [{
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ }];
+ table.render(option);
+ }
+ //缂栬緫鑾峰彇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Sc_ProcessExchangeBill/GetProcessExchangeBillMain",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessExchangeBillQuery[0];
+ form.val("component-form-group", {
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HInterID": data.hmainid
+ , "HPRDORGID": data.HPRDORGID
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
+ , "HPicNumVer": data.鍥惧彿鐗堟湰
+ , "HMaterName2": data.浜у搧鍚嶇О
+ , "HMaterID2": data.HMaterID2
+ , "HMaterNumber2": data.浜у搧浠ｇ爜
+ , "HMaterModel2": data.浜у搧瑙勬牸
+ , "HPicNumAssemble": data.鎬昏鍥惧彿
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HICMOInterID": data.hicmointerid
+ , "HQty": data.娴佽浆鍗℃暟閲�
+ , "HUnitName": data.鍗曚綅
+ , "HUnitID": data.HUnitID
+ , "HMaterTexture": data.鏉愯川
+ , "HPlanBeginDate": formatDate(data.璁″垝寮�宸ユ棩鏈�)
+ , "HPlanEndDate": formatDate(data.璁″垝瀹屽伐鏃ユ湡)
+ , "HEquipMentName": data.璁惧鍚嶇О
+ , "HEquipMentID": data.HEquipMentID
+ , "HProductNum": data.鎴愬搧缂栧彿
+ , "HExplanation": data.琛ユ枡鍘熷洜
+ , "HBLFlag": data.琛ユ枡鏍囪
+ , "HProjectNum": data.椤圭洰缂栧彿
+ , "HVerNum": data.鐗堟湰
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HMateOutBatchNo": data.鍘熸枡鎵规
+
+
+ , "HWorkShopName": data.鐢熶骇杞﹂棿
+ , "HWorkShopID": data.HWorkShopID
+ , "textBox2": data.浠诲姟鍗曞彿
+ , "HSupName": data.濮斿鍔犲伐鍗曚綅
+ , "HSupID": data.HSupID
+ , "HMaterName": data.瀛愪欢鍚嶇О
+ , "HMaterID": data.HMaterID
+ , "HMaterNumber": data.瀛愪欢浠ｇ爜
+ , "HMaterModel": data.瀛愪欢瑙勬牸
+ , "HUnitNumber": data.鍗曚綅浠ｇ爜
+ , "HMainMaterID": data.涓昏鏉愭枡
+ , "HPlanQty": data.鐢熶骇鏁伴噺
+ , "HprocExQty": data.鐢熶骇鏁伴噺
+ , "HKeyMaterID": data.鍏抽敭鏉愭枡
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HProdMaterCode": data.浜у搧CODE
+ , "HSeOrderBillNo": data.閿�鍞鍗曞彿
+ , "HSeOrderEntryID": data.HSeOrderEntryID
+ , "HSeOrderInterID": data.HSeOrderInterID
+ , "HCusShortName": data.瀹㈡埛绠�绉�
+ , "HCusNeedMaterial": data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎
+ , "HPlanSendGoodsDate": data.棰勮鍑鸿揣鏃ユ湡
+ , "HProdMaterName": data.浜у搧鍚嶇О2
+ , "HCusName": data.瀹㈡埛鍚嶇О
+ , "HWorkRemark": data.鐢熶骇澶囨敞
+ , "HImportNote": data.閲嶈鎻愮ず
+ , "HMaterNumber_A": data.鍘熸潗鏂欑紪鍙稟
+ , "HMaterNumber_B": data.鍘熸潗鏂欑紪鍙稡
+ , "HMaterNumber_C": data.鍘熸潗鏂欑紪鍙稢
+ , "HMaterNumber_D":data.鍘熸潗鏂欑紪鍙稤
+ , "HProdType": data.鐢熶骇绫诲瀷
+ , "HMaterShortName": data.鍘熸潗鏂欑畝绉�
+ , "HMaterIDA": data.鍘熸潗鏂欏唴鐮丄
+ , "HMaterIDB": data.鍘熸潗鏂欏唴鐮丅
+ , "HMaterIDC": data.鍘熸潗鏂欏唴鐮丆
+ , "HMaterIDD": data.鍘熸潗鏂欏唴鐮丏
+
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": formatDate(data.鍒跺崟鏃ユ湡)
+ , "HCheckDate": formatDate(data.瀹℃牳鏃ユ湡)
+ , "HCloseDate": formatDate(data.鍏抽棴鏃ユ湡)
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HUpDateDate": formatDate(data.淇敼鏃ユ湡)
+ , "HDeleteDate": formatDate(data.浣滃簾鏃ユ湡)
+
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ // 缂栬緫鑾峰彇琛ㄤ綋
+ function set_EditGrid(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sc_ProcessExchangeBill/GetProcessExchangeBillSub',
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//杩斿洖鐢熶骇浠诲姟鍗�
@@ -1401,50 +1528,6 @@
ZRProcName, QRName;
- function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
- {
- HReasonName = obj[0].HName;
- ReasonID = obj[0].HItemID;
- }
-
- //杩斿洖浜у搧
- function GetHMaterNameValue(obj) {
- $("#HMaterName2").val(obj[0].HName);
- $("#HMaterID2").val(obj[0].HItemID);
- $("#HMaterNumber2").val(obj[0].HNumber);
- $("#HMaterHModel2").val(obj[0].HModel);
- }
- function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
- EmpName = obj[0].HName;
- // $("#HEmpName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
- function GetHProcValue(obj) {
- subProcName = obj[0].宸ュ簭;
- subProcID = obj[0].HItemID;
- subProcNumber = obj[0].HProcNumber;
- }
- function GetHSupValue(obj) {
- subSupName = obj[0].HName;
- subSupID = obj[0].HItemID;
- subSupNumber = obj[0].HNumber;
- }
- function GetWorkCenterValue(obj) {
- subWorkCenterName = obj[0].宸ヤ綔涓績;
- subWorkCenterID = obj[0].HItemID;
- subWorkCenterNumber = obj[0].宸ヤ綔涓績浠ｇ爜;
- }
- function GetHZRValue(obj) { //杩斿洖璐ｄ换宸ュ簭
- ZRProcName = obj[0].宸ュ簭;
- //$("#HZRProcName").val(obj[0].宸ュ簭);
- //$("#HItemID").val(obj[0].HItemID);
- }
- //HWorker
- function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
- QRName = obj[0].HName;
- //$("#HQRName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\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 7793685..6bff845 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"
@@ -83,6 +83,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></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>
</div>
@@ -146,6 +148,12 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
+ //棰勮
+ case 'btn_view': get_view();
+ break;
+ //鎵撳嵃
+ case 'btn_print': get_print();
+ break;
};
});
@@ -163,6 +171,7 @@
});
//#endregion
+
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
//鍒濆鍖栦富琛ㄥ垪琛�
@@ -177,13 +186,15 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#SHPrintQty").val("");//鎵撳嵃鐘舵��
- wybj = false;//濮斿鏍囪
+ $("input[type='checkbox'][name='wybj']").prop('checked', false);
+ form.render("checkbox");//濮斿鏍囪
$("#HDate").val("");//寮�濮嬫棩鏈�
$("#HDate1").val("");//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
//$("#btnSearch").click();
sWhere = "";
+ get_Display(sWhere);
}
//#endregion
@@ -226,69 +237,6 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- ////鏌ヨ鎸夐挳
- //form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- // var SHPrintQty = $("#SHPrintQty").val();//鎵撳嵃鐘舵��
- // var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
- // var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
- // var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
- // var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
- // if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
- // if (SHPrintQty == "鍏ㄩ儴") {
- // sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
- // }
- // if (SHPrintQty == "宸叉墦鍗�") {
- // sWhere = " and 鎵撳嵃娆℃暟 > 0 ";
- // }
- // if (SHPrintQty == "鏈墦鍗�") {
- // sWhere = " and 鎵撳嵃娆℃暟 = 0 ";
- // }
- // }
- // if (wybj) {
- // sWhere += " and 濮斿鏍囪 = 'Y'";
- // }
- // if (HDate) {
- // sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
- // }
- // if (HDate1) {
- // sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
- // }
- // if (HOrderProcNO) {
- // sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
- // }
- // if (SHname) {
- // sWhere += " and 瀛愪欢鍚嶇О like '%" + SHname + "%' or 瀛愪欢瑙勬牸 like '%" + SHname + "%'"
- // }
- // $.ajax({
- // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- // url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
- // type: "GET",
- // data: { "sWhere": sWhere },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- // } else {
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- // }
- // });
- // sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- //});
-
- ////閲嶇疆鎸夐挳
- //form.on('submit(btnReSearch)', function (data) {
- // $("#SHPrintQty").val("");//鎵撳嵃鐘舵��
- // wybj = false;//濮斿鏍囪
- // $("#HDate").val("");//寮�濮嬫棩鏈�
- // $("#HDate1").val("");//缁撴潫鏃ユ湡
- // $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
- // $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
- // $("#btnSearch").click();
- //});
//閫変腑鍒ゆ柇
form.on('checkbox(wybj)', function (data) {
@@ -510,42 +458,99 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var linterid = data[0];
+ var linterid = data[0].hmainid;
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
, area: ['100%', '100%']
, title: '宸ュ簭鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + hsubid+'&HSouceBillType='
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
//#endregion
- ////鏌ヨ
- //function get_Display(sWhere)
- //{
- // //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- // $.ajax({
- // url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
- // type: "GET",
- // data: { "sWhere": sWhere },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // } else {
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- // }
- // });
- //}
- //#endregion
+ //鍒犻櫎
+ 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) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //棰勮
+ function get_view() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //鎵撳嵃
+ function get_print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
//#region 鍒锋柊
function get_Refresh() {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index 30bd422..5f832d2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -141,6 +141,7 @@
<label class="layui-form-label">瀹屾垚鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="" selected>鍏ㄩ儴</option>
<option value="鏈畬鎴�" selected>鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 52e621d..144a74b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -148,6 +148,7 @@
<label class="layui-form-label">瀹屾垚鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="" selected>鍏ㄩ儴</option>
<option value="鏈畬鎴�" selected>鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
--
Gitblit v1.9.1