From e736994bec494f59214c40bf9d1eaab85a63ed83 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 17 五月 2022 10:49:11 +0800
Subject: [PATCH] nothing
---
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx.designer.cs | 26
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ICMOBillList.aspx | 12
WebTM/Vlog/webapi20220512.txt | 9
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Check_New.html | 1027 +++++++++
WebTM/views/生产管理/生产装箱单/QK_PackedBillList.html | 2
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 101
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 59
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastCheck.html | 1031 ++++++++++
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_CheckList_New.html | 228 ++
WebTM/views/grf/花型条码.grf | 294 ++
WebTM/views/grf/生产单.grf | 107
WebTM/views/home/console_Mobile.html | 12
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 8
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 108
WebTM/views/index.html | 7
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Check_New.html | 966 +++++++++
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 8
WebTM/views/grf/物料名称条码.grf | 276 ++
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 127
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_PackingBillList.aspx | 45
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 495 +++-
WebTM/views/grf/包装方式条码.grf | 276 ++
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 19
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html | 4
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 49
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx.cs | 17
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx | 46
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 47
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipFileMainBill.aspx.designer.cs | 9
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBill_CheckList_New.html | 228 ++
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNewList.html | 4
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 310 +++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 183 +
WebTM/WebTM.csproj | 17
35 files changed, 5,781 insertions(+), 378 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 9d223dc..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-19T08:20:09.8422169Z;False|2022-04-12T15:13:02.1028573+08:00;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+ <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/19/2022 16:19:30</publishTime>
+ <publishTime>05/13/2022 14:55:57</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>04/19/2022 16:19:30</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/19/2022 10:43:59</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>01/10/2022 21:12:01</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>
@@ -1905,16 +1914,25 @@
<publishTime>11/10/2021 10:49:48</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_MouldScrapOutStockBill.aspx">
- <publishTime>11/10/2021 10:50:19</publishTime>
+ <publishTime>04/22/2022 17:21:07</publishTime>
</File>
<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/13/2022 10:14:38</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>
@@ -2691,7 +2712,7 @@
<publishTime>02/10/2022 17:29:15</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">
- <publishTime>03/29/2022 15:12:53</publishTime>
+ <publishTime>04/22/2022 16:38:35</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">
<publishTime>02/10/2022 17:29:15</publishTime>
@@ -2726,23 +2747,29 @@
<File Include="views/鐢熶骇绠＄悊/鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsList.html">
<publishTime>04/01/2022 17:41:37</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html">
+ <publishTime>05/06/2022 10:57:40</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html">
+ <publishTime>05/06/2022 10:57:40</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">
<publishTime>04/19/2022 10:43:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html">
- <publishTime>04/19/2022 10:43:59</publishTime>
+ <publishTime>04/22/2022 17:21:07</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html">
<publishTime>04/19/2022 10:43:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html">
- <publishTime>04/19/2022 10:43:59</publishTime>
+ <publishTime>04/22/2022 17:21:07</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">
- <publishTime>04/19/2022 10:43:59</publishTime>
+ <publishTime>04/22/2022 17:21:07</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html">
- <publishTime>04/19/2022 10:43:59</publishTime>
+ <publishTime>04/22/2022 17:21:07</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇涓婃枡鍗�/Sc_MaterToSourceBillList - 澶嶅埗.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -2751,7 +2778,7 @@
<publishTime>09/14/2021 08:59:03</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <publishTime>04/11/2022 14:30:58</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>
@@ -2813,6 +2840,12 @@
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html">
<publishTime>02/18/2022 16:21:15</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html">
+ <publishTime>05/06/2022 10:57:40</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">
+ <publishTime>05/06/2022 10:57:40</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
<publishTime>02/10/2022 17:29:15</publishTime>
</File>
@@ -2835,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>
@@ -2855,6 +2888,12 @@
<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>05/06/2022 10:57:40</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">
<publishTime>09/09/2021 15:03:44</publishTime>
</File>
@@ -2863,6 +2902,12 @@
</File>
<File Include="views/鐢熶骇绠＄悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">
<publishTime>03/25/2022 10:56:40</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html">
+ <publishTime>04/22/2022 17:21:07</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterialDetailList.html">
+ <publishTime>04/22/2022 17:21:07</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">
<publishTime>02/10/2022 17:29:15</publishTime>
@@ -2913,10 +2958,10 @@
<publishTime>03/17/2022 14:11:22</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
- <publishTime>02/18/2022 17:33:05</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
- <publishTime>02/18/2022 17:33:05</publishTime>
+ <publishTime>05/06/2022 10:57:40</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
<publishTime>03/01/2022 17:51:08</publishTime>
@@ -3270,7 +3315,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">
- <publishTime>04/08/2022 15:47:53</publishTime>
+ <publishTime>04/21/2022 20:53:20</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -3279,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>
@@ -3294,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>
@@ -3324,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>
@@ -3333,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>
@@ -3534,7 +3579,7 @@
<publishTime>04/15/2022 16:02:48</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/19/2022 16:20:04</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/WebTM.csproj b/WebTM/WebTM.csproj
index 6902516..eb8c363 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -140,6 +140,8 @@
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_CheckList_New.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Check_New.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockRequestBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockStepOutBill_Fast.html" />
<Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillList.html" />
@@ -204,6 +206,9 @@
<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>
@@ -642,6 +647,7 @@
<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\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList.html" />
@@ -857,6 +863,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackedBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackingBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.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" />
@@ -969,6 +976,9 @@
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBillLEdit.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBackBillList.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_FastCheck.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_CheckList_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_Check_New.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
@@ -1305,6 +1315,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>
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/\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/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 6a75b59..fbe63d6 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -124,6 +124,18 @@
<cite>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>棰嗘枡鍑哄簱鍗曟牎楠�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_CheckList_New.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>棰嗘枡鍑哄簱鍗曟牎楠岀紦瀛樺垪琛�</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 3b4c284..c62bc41 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -361,6 +361,13 @@
<a>鏃ヨ鍒掑钩鍙�</a>
<dl class="layui-nav-child">
<dd>
+ <a>鐢熶骇璁″垝骞冲彴</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/">鐢熶骇璁″垝骞冲彴1</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">瀵煎叆</a></dd>
+ </dl>
+ </dd>
+ <dd>
<a>鏃ヨ鍒掑伐鍗�</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_CheckList_New.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_CheckList_New.html"
new file mode 100644
index 0000000..b512c21
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_CheckList_New.html"
@@ -0,0 +1,228 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>鍏朵粬鍑哄簱鏍￠獙缂撳瓨鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-tab" lay-filter="tab-POStockInBillList">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1">鍗曟嵁鍒楄〃</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //娓呯┖鐣岄潰 new
+
+ //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+ //鍔犺浇婧愬崟绫诲瀷
+
+ //璇诲彇鍗曟嵁鍒楄〃
+ //
+
+ form.on('submit(Cancel)', function () {
+ parent.location.href = "../../../views/index.html"
+ //window.close();//鍏抽棴褰撳墠椤�
+ })
+
+
+
+
+ form.on('submit(cmdModify)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '棰嗘枡鍑哄簱鏍￠獙'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html?linterid=' + data[0].HInterID + '&lBillNo=' + data[0].HBillNo, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ var option = {
+ elem: '#dj-table'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ // url: GetWEBURL() + '/Web/chanpinruk',
+ form.on('submit(cmdRefresh)', function () {//鍒锋柊
+ table.render({
+ elem: '#dj-table'
+ ,url: GetWEBURL() + '/Web/chanpinruk'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+ });
+
+
+
+ form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ var sInterID = data[0].HInterID
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/ProductInBillList/Delete_Json",
+ async: true,
+ data: { "sHInterID": sInterID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ });
+ });
+
+
+
+ var sBillType = '1204'
+ table.render({
+ elem: '#dj-table'
+ , url: GetWEBURL() + '/OtherOutBill_Check_New/DisPonderationBillMain_TempList_BillCheck'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"]}
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: 'HOWNERName', title: '缁勭粐', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+
+ //鍒锋柊鏄庣粏椤电
+ table.render({
+ elem: '#mx-table'
+ // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+ //, toolbar: '#toolbarDemo'
+ // , where: { sMsg: linterid, sMsg2: lentryid }
+ , cols: [[
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ ]]
+ , page: true
+ , height: 500
+ , done: function () {
+ }
+ });
+ });
+ //娓呯┖琛ㄥご
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Check_New.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Check_New.html"
new file mode 100644
index 0000000..21a063a
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Check_New.html"
@@ -0,0 +1,1027 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐩存帴璋冩嫧鍗曟牎楠�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <style>
+ .layui-col-xs4 {
+ width: 12.333333%
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ <!--<div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+ </div>-->
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-Kf_OtherInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <!-- <li lay-id="1">婧愬崟淇℃伅</li>-->
+ <li lay-id="1">琛ㄥご淇℃伅</li>
+ <li lay-id="2">浠撳簱淇℃伅</li>
+ <li lay-id="3">鐗╂枡淇℃伅</li>
+ <li lay-id="4">鍚堣淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input mobile">
+ </div>
+ <div class="layui-col-xs3">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px;">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" id="HSCWHID-BT" lay-submit="" class="layui-btn" lay-filter="HSCWHID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px;">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT" style="display:none">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨嚭缁勭粐</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HStockOutOrgName" id="HStockOutOrgName" lay-verify="HStockOutOrgName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HStockOutOrgID" id="HStockOutOrgID" lay-verify="HStockOutOrgID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HStockOutOrgID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨叆缁勭粐</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HStockInOrgName" id="HStockInOrgName" lay-verify="HStockInOrgName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HStockInOrgID" id="HStockInOrgID" lay-verify="HStockInOrgID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HStockInOrgID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver" id="Saver">鎻愪氦</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+
+ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+ $("#HWHID").val(sessionStorage["HWHID"]);
+ $("#HWHNAME").val(sessionStorage["HWHName"]);
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var lBillNo = params[params[1]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "/OtherOutBill_Check_New/bj",
+ type: "GET",
+ data: { "HBillNo": lBillNo, "HBillType": '1207'},
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //console.log(JSON.stringify(result.data.hItemIDField))
+ //return;
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $('#HInterID').val(result.data.hInterIDField)
+ $('#HBillNo').val(result.data.hBillNoField)
+ var HBillID = $('#HInterID').val()
+ element.tabChange('tab-Kf_OtherInBill', '2');
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: HBillID, HBillType: '1207', sWhere: '' }
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HWHName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+ , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+
+
+ //function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+ //{
+ // table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ // });
+ //}
+
+ //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+
+
+
+
+
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1207' },
+ success: function (d) {
+ //console.log(d.data);
+ //$("#HInterID").val(d.data[0].HInterID);
+ //$("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(linterid);
+ }
+
+
+ if (1 == 2) {
+ element.tabChange('tab-Kf_OtherInBill', '2');
+ var pFocus = $("#HBarCode");
+ pFocus.focus();
+ pFocus.select();
+ }
+ else {
+ element.tabChange('tab-Kf_OtherInBill', '1');
+ var pFocus = $("#HBillNo");
+ pFocus.focus();
+ pFocus.select();
+ }
+
+ //
+ function Sub_ClearBill() {
+ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+ $("#HWHID").val(sessionStorage["HWHID"]);
+ $("#HWHNAME").val(sessionStorage["HWHName"]);
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMaker").hide();
+ $("#HMakerID").hide();
+
+ //璁剧疆鍗曟嵁鍙�
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ //$.ajax({
+ // url: GetWEBURL() + "/Web/GetMAXNum",
+ // type: "GET",
+ // data: { "HBillType": '1206' },
+ // success: function (d) {
+ // $("#HInterID").val(d.data[0].HInterID);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // }
+ //});
+ //鐒︾偣
+ //鍒锋柊
+ var sInterID = $("#HInterID").val()
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ //
+
+ form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '渚涘簲鍟嗗垪琛�'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+
+
+ //form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '淇濈鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+ //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+ // var sMainStr = JSON.stringify(data.field);
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '楠屾敹鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+ form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/UserInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeper").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+ form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨鍙戣揣
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/UserInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSecManager").val(checkStatus.data[0].HName);
+ $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+
+
+ form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ form.on('submit(Cancel)', function () {
+ sessionStorage["SourceFlag"] = false;
+ parent.location.href = "../../../views/index.html"
+ //window.close();//鍏抽棴褰撳墠椤�
+ })
+
+ form.on('submit(cmdModify)', function () {//缂栬緫
+ var sSubStr = table.cache['wl-table'];
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏄庣粏鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ // }
+ });
+
+ form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ // console.log(data);
+ var sInterID = $('#HInterID').val()
+ var sMaterID = data[0].HMaterID
+ var sBillType = '1207'
+ var sAuxPropID = data[0].HAuxPropID
+ //var sMTONo = data[0].HMTONo
+ var sMTONo = ''
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+ $.ajax(
+ {
+ type: "Get",
+ //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/MateBill/Delete_Json1",
+ async: true,
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ });
+ });
+
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = true;
+ data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sMain = sMainStr;
+ var sSubStr = table.cache['wl-table'];
+ var sSourceType = $("#HBillType").val();
+ if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+ {
+ layer.load(3);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/MateOutBill_Check_New/set_SaveMateOutBill_Check_New_Json",
+ async: true,
+ data: { "oMain": sMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.confirm("鐩存帴璋冩嫧鍗曟楠屾垚鍔燂紒" + data.Message + $("#HBillNo").val(), {
+ 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(); });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ });
+ }
+ else {
+ layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ });
+
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+ //鎵崟鎹彿
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val()
+ //var HBillID = $('#HInterID').val()
+ var HBillType = '1207'
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/MoveStockBill/BillNo2",
+ type: "GET",
+ data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": sessionStorage["HUserName"], "HOwnerID": sessionStorage["OrganizationID"]},
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //console.log(JSON.stringify(result.data.hItemIDField))
+ //return;
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hSCWhIDField);
+ $("#HSCWHNAME").val(result.data.hSCWhNameField);
+ $('#HInterID').val(result.data.hInterIDField)
+ $('#HBillNo').val(result.data.hBillNoField)
+ var HBillID = $('#HInterID').val()
+ element.tabChange('tab-Kf_OtherInBill', '2');
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: HBillID, HBillType: HBillType, sWhere: '' }
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HWHName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+ , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+ }
+ });
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+ //纭畾
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+
+
+ //鎵簮鍗�
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+ //纭畾
+ form.on('submit(QueDin2)', function (data) {
+ GetMeesageBySourceBillNo();
+ });
+
+ table.render({
+ elem: '#mx-table'
+ // , url: 'http://localhost:8083/OtherInStockBill/GetHBarCodeShowBillSub'
+ //, toolbar: '#toolbarDemo'
+ // , where: { sMsg: linterid, sMsg2: lentryid }
+ , cols: [[
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ ]]
+ , page: true
+ , height: 500
+ , done: function () {
+ }
+ });
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ var sSubStr = table.cache['wl-table'];
+ var sBarCode = $('#HBarCode').val()
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var sQty = $("#HQty").val()
+ if (sQty == "") {
+ sQty = 0;
+ }
+ var sHBillType = '1207'
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+ var sHSCWHID = $("#HSCWHID").val()
+ var sHSCSPID = $("#HSCStockPlaceID").val()
+ var HOrgID = $("#HOrgID").val();//缁勭粐
+ //鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ if (sQty != "") {
+ $('#HQty').val("");
+ }
+ $.ajax({
+ //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/OtherOutBill_Check_New/get_InfoByBarCode_Source_Json",
+ type: "GET",
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sHBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "SCWhID": sHSCWHID, "SCSPID": sHSCSPID, "sQty": sQty, "HOWNERID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.HBarType == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HStockPlaceName").val("");
+ $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+ element.tabChange('tab-Kf_OtherInBill', '2'); //璺宠浆椤电
+ }
+ else if (result.data.HBarType == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.HSPName);
+ $("#HStockPlaceID").val(result.data.HSPID);
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+ element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+ }
+ else {
+ element.tabChange('tab-Kf_OtherInBill', '3');
+ }
+ layer.load(3)
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HWHName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+ , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ function playSound() {
+ var audio = document.getElementById("cs");
+ if (audio == null)
+ $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+ var audio = document.getElementById("cs");
+ audio.play();
+ }
+ function playSound1() {
+ var audio = document.getElementById("cs2");
+ audio.play();
+ }
+ //鎵簮鍗�
+ function GetMeesageBySourceBillNo(obj) {
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ if (HSourceBillNo == "" || sInterID <= 0) {
+ layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+ url: GetWEBURL() + "/OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+ type: "GET",
+ data: { "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.load(3)
+ table.render({
+ elem: '#wl-table'
+ //, url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+ //浠ヤ笂涓� Layui妯″潡
+ function GetHWHValue(obj) //杩斿洖浠撳簱
+ {
+ $("#HWHNAME").val(obj[0].HName);
+ //sessionStorage["HWHID"] = obj[0].HItemID;
+ $("#HWHID").val(obj[0].HItemID);
+ }
+ function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ }
+ //function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
+ // $("#HSupName").val(obj[0].HName);
+ // $("#HSupID").val(obj[0].HItemID);
+ //}
+ function GetHKeeperValue(obj) { //杩斿洖淇濈
+ $("#HKeeper").val(obj[0].HName);
+ $("#HKeeperID").val(obj[0].HItemID);
+ }
+ function GetHSecManagerValue(obj) { //杩斿洖楠屾敹
+ $("#HSecManager").val(obj[0].HName);
+ $("#HSecManagerID").val(obj[0].HItemID);
+ }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //if ($("#HSourceBillNo").val() == '') {
+ // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+ // return false;
+ //}
+ //if($("#HDeptName").val()=='')
+ //{
+ // layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ //if ($("#HSecManager").val() == '') {
+ // layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ //if ($("#HKeeper").val() == '') {
+ // layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ //if ($("#HSupName").val() == '') {
+ // layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ //if ($("#HWHNAME").val() == '') {
+ // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ if ($("#HBillNo").val() == '') {
+ layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
+ return false;
+ }
+ if ($("#HInterID").val() == '') {
+ layer.msg("閿欒鐨勫唴鐮�!", { icon: 5 });
+ return false;
+ }
+ if (sSubStr == '' || sSubStr.length == 0) {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
+ return false;
+ }
+ if (sSubStr != '') {
+ for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+ if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+ if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+ layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5 });
+ return false;
+ }
+ }
+ }
+ for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ if (parseFloat(sSubStr[i].HQty) > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ layer.msg("鍏朵粬鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+ return false;
+ }
+ }
+ else {
+ return true;
+ }
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 56753bf..83db064 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -867,13 +867,6 @@
//鎵潯鐮�
$('#HBarCode').on('keydown', function (event) {
var sQty = $("#HQty").val();
- if (sSourceBillNo == null)
- {
- sSourceBillNo = "";
- }
- if (sQty == "") {
- sQty = 0;
- }
if (event.keyCode == 13) {
GetMeesageByBarCode();
}
@@ -999,6 +992,18 @@
var HOrgID = $("#HOrgID").val();//缁勭粐
var sBillType = '1207';
var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
+ if (sSourceBillNo == null) {
+ sSourceBillNo = "";
+ }
+ if (sQty == "") {
+ sQty = 0;
+ }
+
+ if (HWHID == SCWhID)
+ {
+ layer.msg("璋冨叆浠撳簱璺熻皟鍑轰粨搴撲竴鑷达紝璇烽噸鏂伴�夋嫨璋冨叆浠撳簱鎴栬�呰皟鍑轰粨搴�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
if (HDeleteFlag == "*") {
if (sBarCode != "") {
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..715eca4 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,10 @@
var Type = params[params[1]];
var OpenTmp = params[params[2]];
+ if (OpenTmp =="澧欏挃鏉＄爜") {
+ Type += "1";
+ }
+
switch (Type) {
//case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
@@ -172,8 +176,8 @@
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, "");
- break;
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?typename='" + OpenTmp + "'&linterid=" + value, true, "");
+ break;
}
</script>
</body>
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..b73c6f5 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.HBarCode 绠卞彿,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.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">
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 0d2e839..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+")");
-
+ 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/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index a364a28..201799d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -320,10 +320,16 @@
<input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
+ <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="HBarCode" id="HBarCode" style="background-color:#efefef4d;">
+ </div>
+ </div>
</div>
</div>
</div>
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 2ea5646..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"
@@ -67,9 +67,40 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+ <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">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
</div>
</div>
</div>
@@ -117,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
@@ -189,60 +240,72 @@
{ type: 'checkbox', fixed: 'left' }
, { 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: 170 }
- , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 105 }
+
+ , { 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: '閿�鍞鍗曟棩鏈�', 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 }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
- , { field: 'HMaterID', title: 'HMaterID' , hide: true}
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- , { field: 'hunitid', title: 'hunitid' , hide: true}
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115, hide: true }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115, hide: true}
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { 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, 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}
]]
};
}
@@ -280,6 +343,10 @@
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ var HMaterName = $("#HMaterName").val();//鍗曟嵁鍙�
+ var HDeptName = $("#HDeptName").val();//鍗曟嵁鍙�
+ var HStatus = $("#HStatus").val();//鍗曟嵁鍙�
+ var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
if (HDate) {
sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
}
@@ -292,6 +359,18 @@
if (WorkCenter) {
sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
}
+ 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缂撳瓨
}
@@ -303,6 +382,10 @@
$("#HDate1").val("");//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#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\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 7bafa57..a479d5e 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"
@@ -72,12 +72,12 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎵撳嵃娆℃暟</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-input-block" style="margin-left: 115px;">
<input type="text" class="layui-input" lay-verify="HPrintQty" name="HPrintQty" id="HPrintQty">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁″垝閮ㄩ棬</label>
+ <label class="layui-form-label" style="width: 85px;">璁″垝閮ㄩ棬</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HDeptIDName" name="HDeptIDName" id="HDeptIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -102,12 +102,12 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍏ュ簱鏁伴噺</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-input-block" style="margin-left: 115px;">
<input type="text" class="layui-input" lay-verify="HInStockQty" name="HInStockQty" id="HInStockQty">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡</label>
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡</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="HMaterIDNumber" name="HMaterIDNumber" id="HMaterIDNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -131,21 +131,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐝粍</label>
+ <label class="layui-form-label" style="width: 85px;">鐝粍</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HGroupID" name="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HGroupIDName" name="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroupID" id="btnHGroupID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroupID" id="btnHGroupID" style="padding: 0 10px;float: right;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</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;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -159,31 +159,31 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅</label>
+ <label class="layui-form-label" style="width: 85px;">鍗曚綅</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HUnitID" name="HUnitID" id="HUnitID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HUnitIDName" name="HUnitIDName" id="HUnitIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitID" id="btnHUnitID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitID" id="btnHUnitID" style="padding: 0 10px;float: right;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎿嶄綔宸�</label>
+ <label class="layui-form-label" style="width: 85px;">鎿嶄綔宸�</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HWorkerID" name="HWorkerID" id="HWorkerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HWorkerIDName" name="HWorkerIDName" id="HWorkerIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkerID" id="btnHWorkerID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkerID" id="btnHWorkerID" style="padding: 0 10px;float: right;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HSourceIDName" name="HSourceIDName" id="HSourceIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID" style="padding: 0 10px;float: right;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -191,7 +191,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸ュ崟鐢熶骇鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 78px;">
</div>
</div>
</div>
@@ -259,13 +259,13 @@
<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: 48px;">
+ <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 78px;">
</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="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 78px;">
</div>
</div>
<div class="layui-inline">
@@ -321,7 +321,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缂栧埗鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HPreparatDate" name="HPreparatDate" id="HPreparatDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HPreparatDate" name="HPreparatDate" id="HPreparatDate" style="padding-left: 78px;">
</div>
</div>
<div class="layui-inline">
@@ -333,7 +333,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁㈠崟浜よ揣鏈�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HOrderCommitDate" name="HOrderCommitDate" id="HOrderCommitDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HOrderCommitDate" name="HOrderCommitDate" id="HOrderCommitDate" style="padding-left: 78px;">
</div>
</div>
</div>
@@ -1237,7 +1237,7 @@
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (d) {
-
+
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": d.data[0].鍗曟嵁鍙�
@@ -1321,6 +1321,15 @@
option.data = rowdata;
table.render(option);
+ //涓婚攣瀹氭爣璁�
+ if (d.data[0].涓婚攣瀹氭爣璁� == "1") {
+ $("#checkboxHLocked").attr("checked", true);
+ }
+ //鎸傝捣鏍囪
+ if (d.data[0].鎸傝捣鏍囪 == "1") {
+ $("#checkboxHHangUp").attr("checked", true);
+ }
+
//鏄惁鎵嬪伐鍏抽棴
if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
$('#HCloseTypeSub1').attr("checked", true);
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..4ec2752 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"
@@ -216,7 +216,7 @@
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html"
index be3b74b..5f2744a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html"
@@ -107,7 +107,7 @@
//璇诲彇鍗曟嵁鍒楄〃
//
- form.on('submit(Cancel)', function () {
+ form.on('submit(cmdCancel)', function () {
parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
@@ -212,7 +212,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
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..2e6ca33 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",
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..8eba67b 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,8 +37,8 @@
<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="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</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>
</form>
@@ -110,7 +110,14 @@
//鏁寸鐢熸垚
form.on('submit(btnPack)', function (data) {
var flag = "ZZ";
- var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr = table.checkStatus('mainTable');
+ if (sSubStr.data.length > 0) {
+ SavePack(flag, sSubStr);
+ }
+ else {
+ layer.msg('璇锋渶灏戦�夋嫨1琛屾暟鎹紒');
+ return;
+ }
SavePack(flag, sSubStr);
});
//鎷肩鐢熸垚
@@ -156,7 +163,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 +177,15 @@
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', event: 'HMinQty', width: 100 }
, { field: 'HTotalQty', title: '鐢熸垚鏉℃暟', edit: 'false', width: 100 }
, { field: 'HSpsQty', 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 }
@@ -205,13 +223,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"] + ";" + flag + ";" + sessionStorage["OrganizationID"]},
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 +249,6 @@
error: function (err) {
f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
}
});
}
@@ -231,9 +257,8 @@
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;
}
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..ae283c6
--- /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,310 @@
+锘�<!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_AddNew"><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 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(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 () {
+ 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();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ var myDate = new Date();
+ var yyyy = myDate.getFullYear();
+ var MM = myDate.getMonth() + 1;
+ var dd = myDate.getDate();
+ var SumMonth = 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: '鐢熶骇璧勬簮' });
+ 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 });
+ 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), 'yyyy-MM-dd'), edit: 'text' })
+ }
+ for (var i = 1; i < dd; i++) {
+ columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), edit: 'text' })
+ }
+ 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);
+ });
+ }
+ }
+
+
+ //#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 6207532..92e5ee6 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"
@@ -502,7 +502,7 @@
})
//淇濆瓨鎻愪氦
- form.on('change(btnSave)', function (data) {//鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
if (AllowLoadData()) {
set_AddNew(data);
}
@@ -953,7 +953,7 @@
//闈炵┖楠岃瘉
function AllowLoadData() {
- if ($("#HSettleCurrId").val() == "") {
+ if ($("#HSettleCurrId").val() == "0") {
layer.msg("甯佸埆娌℃湁閫夋嫨");
return false;
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 3fe49e8..04ba901 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -36,6 +36,16 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
</div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-SellOutBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -188,6 +198,7 @@
</div>
</div>
</div>
+
<!--鐗╂枡娓呭崟-->
<div class="layui-tab-item">
<!--<div class="layui-form-item" style="padding:0px;margin:0px">
@@ -200,16 +211,7 @@
</div>
</div>
</div>-->
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
+
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
<!--鏄庣粏娓呭崟-->
@@ -222,7 +224,30 @@
</div>
<!--鏃ュ織-->
<div class="layui-tab-item">
- <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎬绘暟閲�</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ュ織</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HNote" id="HNote" lay-verify="HNote" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
</div>
<!--<div class="layui-form-item" style="margin-bottom: 20px;">
@@ -1161,9 +1186,38 @@
//$("#HSupName").val(result.data.HSupName);
//$("#HDeptID").val(result.data.HDeptID);
//$("#HDeptName").val(result.data.HDeptName);
- table.reload('wl-table', {
- where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
});
+
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.length; i++) {
+ count += result.data.HQty;
+ count1 += result.data.HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
}
else {
// $("#verifycode").click();
@@ -1226,8 +1280,32 @@
//$("#HDeptName").val(result.data[0].HDeptName);
HSourceFlag = true;
element.tabChange('tab-SellOutBill', '3');
- table.reload('wl-table', {
- where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ //table.reload('wl-table', {
+ // where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ //});
+
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
});
$("#HSourceBillNo").attr("disabled", "true");
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_CheckList_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_CheckList_New.html"
new file mode 100644
index 0000000..b512c21
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_CheckList_New.html"
@@ -0,0 +1,228 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>鍏朵粬鍑哄簱鏍￠獙缂撳瓨鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-tab" lay-filter="tab-POStockInBillList">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1">鍗曟嵁鍒楄〃</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //娓呯┖鐣岄潰 new
+
+ //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+ //鍔犺浇婧愬崟绫诲瀷
+
+ //璇诲彇鍗曟嵁鍒楄〃
+ //
+
+ form.on('submit(Cancel)', function () {
+ parent.location.href = "../../../views/index.html"
+ //window.close();//鍏抽棴褰撳墠椤�
+ })
+
+
+
+
+ form.on('submit(cmdModify)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '棰嗘枡鍑哄簱鏍￠獙'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html?linterid=' + data[0].HInterID + '&lBillNo=' + data[0].HBillNo, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ var option = {
+ elem: '#dj-table'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ // url: GetWEBURL() + '/Web/chanpinruk',
+ form.on('submit(cmdRefresh)', function () {//鍒锋柊
+ table.render({
+ elem: '#dj-table'
+ ,url: GetWEBURL() + '/Web/chanpinruk'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+ });
+
+
+
+ form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ var sInterID = data[0].HInterID
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/ProductInBillList/Delete_Json",
+ async: true,
+ data: { "sHInterID": sInterID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ });
+ });
+
+
+
+ var sBillType = '1204'
+ table.render({
+ elem: '#dj-table'
+ , url: GetWEBURL() + '/OtherOutBill_Check_New/DisPonderationBillMain_TempList_BillCheck'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"]}
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: 'HOWNERName', title: '缁勭粐', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+
+ //鍒锋柊鏄庣粏椤电
+ table.render({
+ elem: '#mx-table'
+ // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+ //, toolbar: '#toolbarDemo'
+ // , where: { sMsg: linterid, sMsg2: lentryid }
+ , cols: [[
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ ]]
+ , page: true
+ , height: 500
+ , done: function () {
+ }
+ });
+ });
+ //娓呯┖琛ㄥご
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Check_New.html"
new file mode 100644
index 0000000..a48154d
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Check_New.html"
@@ -0,0 +1,966 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>棰嗘枡鍑哄簱鏍￠獙</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <style>
+ .layui-col-xs4 {
+ width: 12.333333%
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-tab" lay-filter="tab-Kf_OtherInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <!-- <li lay-id="1">婧愬崟淇℃伅</li>-->
+ <li lay-id="1">琛ㄥご淇℃伅</li>
+ <li lay-id="2">鐗╂枡淇℃伅</li>
+ <li lay-id="3">鍚堣淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input mobile">
+ </div>
+ <div class="layui-col-xs3">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver" id="Saver">鎻愪氦</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+
+ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+ $("#HWHID").val(sessionStorage["HWHID"]);
+ $("#HWHNAME").val(sessionStorage["HWHName"]);
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var lBillNo = params[params[1]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "/OtherOutBill_Check_New/bj",
+ type: "GET",
+ data: { "HBillNo": lBillNo, "HBillType": '1204'},
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //console.log(JSON.stringify(result.data.hItemIDField))
+ //return;
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $('#HInterID').val(result.data.hInterIDField)
+ $('#HBillNo').val(result.data.hBillNoField)
+ var HBillID = $('#HInterID').val()
+ element.tabChange('tab-Kf_OtherInBill', '2');
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: HBillID, HBillType: '1204', sWhere: '' }
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HWHName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+ , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+
+
+ //function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+ //{
+ // table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ // });
+ //}
+
+ //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+
+
+
+
+
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1204' },
+ success: function (d) {
+ //console.log(d.data);
+ //$("#HInterID").val(d.data[0].HInterID);
+ //$("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(linterid);
+ }
+
+
+ if (1 == 2) {
+ element.tabChange('tab-Kf_OtherInBill', '2');
+ var pFocus = $("#HBarCode");
+ pFocus.focus();
+ pFocus.select();
+ }
+ else {
+ element.tabChange('tab-Kf_OtherInBill', '1');
+ var pFocus = $("#HBillNo");
+ pFocus.focus();
+ pFocus.select();
+ }
+
+ //
+ function Sub_ClearBill() {
+ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+ $("#HWHID").val(sessionStorage["HWHID"]);
+ $("#HWHNAME").val(sessionStorage["HWHName"]);
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMaker").hide();
+ $("#HMakerID").hide();
+
+ //璁剧疆鍗曟嵁鍙�
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ //$.ajax({
+ // url: GetWEBURL() + "/Web/GetMAXNum",
+ // type: "GET",
+ // data: { "HBillType": '1206' },
+ // success: function (d) {
+ // $("#HInterID").val(d.data[0].HInterID);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // }
+ //});
+ //鐒︾偣
+ //鍒锋柊
+ var sInterID = $("#HInterID").val()
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ //
+
+ form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '渚涘簲鍟嗗垪琛�'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+
+
+ //form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '淇濈鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+ //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+ // var sMainStr = JSON.stringify(data.field);
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '楠屾敹鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+ form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/UserInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeper").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+ form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨鍙戣揣
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/UserInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSecManager").val(checkStatus.data[0].HName);
+ $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+
+
+ form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ form.on('submit(Cancel)', function () {
+ sessionStorage["SourceFlag"] = false;
+ parent.location.href = "../../../views/index.html"
+ //window.close();//鍏抽棴褰撳墠椤�
+ })
+
+ form.on('submit(cmdModify)', function () {//缂栬緫
+ var sSubStr = table.cache['wl-table'];
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏄庣粏鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ // }
+ });
+
+ form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ // console.log(data);
+ var sInterID = $('#HInterID').val()
+ var sMaterID = data[0].HMaterID
+ var sBillType = '1204'
+ var sAuxPropID = data[0].HAuxPropID
+ //var sMTONo = data[0].HMTONo
+ var sMTONo = ''
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+ $.ajax(
+ {
+ type: "Get",
+ //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/MateBill/Delete_Json1",
+ async: true,
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ });
+ });
+
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = true;
+ data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sMain = sMainStr;
+ var sSubStr = table.cache['wl-table'];
+ var sSourceType = $("#HBillType").val();
+ if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+ {
+ layer.load(3);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/MateOutBill_Check_New/set_SaveMateOutBill_Check_New_Json",
+ async: true,
+ data: { "oMain": sMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.confirm("鐢熶骇棰嗘枡鍗曟楠屾垚鍔燂紒" + data.Message + $("#HBillNo").val(), {
+ 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(); });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ });
+ }
+ else {
+ layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ });
+
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+ //鎵崟鎹彿
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val()
+ //var HBillID = $('#HInterID').val()
+ var HBillType = '1204'
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/MateBill/BillNo1",
+ type: "GET",
+ data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": sessionStorage["HUserName"], "HOwnerID": sessionStorage["OrganizationID"]},
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //console.log(JSON.stringify(result.data.hItemIDField))
+ //return;
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $('#HInterID').val(result.data.hInterIDField)
+ $('#HBillNo').val(result.data.hBillNoField)
+ var HBillID = $('#HInterID').val()
+ element.tabChange('tab-Kf_OtherInBill', '2');
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: HBillID, HBillType: HBillType, sWhere: '' }
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HWHName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+ , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+ }
+ });
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+ //纭畾
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+
+
+ //鎵簮鍗�
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+ //纭畾
+ form.on('submit(QueDin2)', function (data) {
+ GetMeesageBySourceBillNo();
+ });
+
+ table.render({
+ elem: '#mx-table'
+ // , url: 'http://localhost:8083/OtherInStockBill/GetHBarCodeShowBillSub'
+ //, toolbar: '#toolbarDemo'
+ // , where: { sMsg: linterid, sMsg2: lentryid }
+ , cols: [[
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ ]]
+ , page: true
+ , height: 500
+ , done: function () {
+ }
+ });
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ var sSubStr = table.cache['wl-table'];
+ var sBarCode = $('#HBarCode').val()
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var sQty = $("#HQty").val()
+ if (sQty == "") {
+ sQty = 0;
+ }
+ var sHBillType = '1204'
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+ var HOrgID = $("#HOrgID").val();//缁勭粐
+ //鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ if (sQty != "") {
+ $('#HQty').val("");
+ }
+ $.ajax({
+ //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/OtherOutBill_Check_New/get_InfoByBarCode_Source_Json",
+ type: "GET",
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sHBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "HOWNERID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.HBarType == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HStockPlaceName").val("");
+ $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+ element.tabChange('tab-Kf_OtherInBill', '2'); //璺宠浆椤电
+ }
+ else if (result.data.HBarType == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.HSPName);
+ $("#HStockPlaceID").val(result.data.HSPID);
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+ element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+ }
+ else {
+ element.tabChange('tab-Kf_OtherInBill', '2');
+ }
+ layer.load(3)
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HWHName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+ , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ function playSound() {
+ var audio = document.getElementById("cs");
+ if (audio == null)
+ $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+ var audio = document.getElementById("cs");
+ audio.play();
+ }
+ function playSound1() {
+ var audio = document.getElementById("cs2");
+ audio.play();
+ }
+ //鎵簮鍗�
+ function GetMeesageBySourceBillNo(obj) {
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ if (HSourceBillNo == "" || sInterID <= 0) {
+ layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+ url: GetWEBURL() + "/OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+ type: "GET",
+ data: { "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.load(3)
+ table.render({
+ elem: '#wl-table'
+ //, url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+ //浠ヤ笂涓� Layui妯″潡
+ function GetHWHValue(obj) //杩斿洖浠撳簱
+ {
+ $("#HWHNAME").val(obj[0].HName);
+ //sessionStorage["HWHID"] = obj[0].HItemID;
+ $("#HWHID").val(obj[0].HItemID);
+ }
+ function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ }
+ //function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
+ // $("#HSupName").val(obj[0].HName);
+ // $("#HSupID").val(obj[0].HItemID);
+ //}
+ function GetHKeeperValue(obj) { //杩斿洖淇濈
+ $("#HKeeper").val(obj[0].HName);
+ $("#HKeeperID").val(obj[0].HItemID);
+ }
+ function GetHSecManagerValue(obj) { //杩斿洖楠屾敹
+ $("#HSecManager").val(obj[0].HName);
+ $("#HSecManagerID").val(obj[0].HItemID);
+ }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //if ($("#HSourceBillNo").val() == '') {
+ // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+ // return false;
+ //}
+ //if($("#HDeptName").val()=='')
+ //{
+ // layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ //if ($("#HSecManager").val() == '') {
+ // layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ //if ($("#HKeeper").val() == '') {
+ // layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ //if ($("#HSupName").val() == '') {
+ // layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ //if ($("#HWHNAME").val() == '') {
+ // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ if ($("#HBillNo").val() == '') {
+ layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
+ return false;
+ }
+ if ($("#HInterID").val() == '') {
+ layer.msg("閿欒鐨勫唴鐮�!", { icon: 5 });
+ return false;
+ }
+ if (sSubStr == '' || sSubStr.length == 0) {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
+ return false;
+ }
+ if (sSubStr != '') {
+ for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+ if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+ if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+ layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5 });
+ return false;
+ }
+ }
+ }
+ for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ if (parseFloat(sSubStr[i].HQty) > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ layer.msg("鍏朵粬鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+ return false;
+ }
+ }
+ else {
+ return true;
+ }
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 48b662e..d3ae225 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -35,6 +35,14 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-MateOutBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -226,14 +234,6 @@
</div>
</div>-->
<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
- </div>
- </div>
</div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
@@ -357,8 +357,8 @@
</div>-->
<table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
</div>
- </div>
- </div>
+ <!--</div>
+ </div>-->
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
@@ -868,12 +868,6 @@
//鎵潯鐮�
$('#HBarCode').on('keydown', function (event) {
- if (sQty == "") {
- sQty = 0;
- }
- if (sHBillType == '-1') {
- sSourceBillNo = ''
- }
if (event.keyCode == 13) {
GetMeesageByBarCode();
}
@@ -994,7 +988,9 @@
var sSourceBillNo = $("#HSourceBillNo").val()
var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
-
+ if (sHBillType == '-1') {
+ sSourceBillNo = ''
+ }
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1047,11 +1043,18 @@
$("#HSupID").val(result.data.HSupID);
$("#HDeptName").val(result.data.HDeptName);
$("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
- sessionStorage["SourceFlag"] = true;
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HBillType").val(result.data.hSourceBillTypeField)
+ HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.HSourceBillType == "3720") {
+ $("#HBillType").empty();
$("#HBillType").val("3720");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
else {
@@ -1061,7 +1064,7 @@
element.tabChange('tab-Kf_MateOutBill', '3');
}
else {
- if (sessionStorage["SourceFlag"] == "true") {
+ if (HSourceFlag == true) {
element.tabChange('tab-Kf_MateOutBill', '3');
}
else {
@@ -1069,11 +1072,18 @@
//$("#HSupID").val(result.data.HSupID);
$("#HDeptName").val(result.data.HDept);
$("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
- sessionStorage["SourceFlag"] = true;
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HBillType").val(result.data.hSourceBillTypeField)
+ HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.HSourceBillType == "3720") {
+ ("#HBillType").empty();
$("#HBillType").val("3720");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
//else if (result.data.HSourceBillType == "1601") {
@@ -1162,12 +1172,15 @@
var HPPQty = $("#HPPQty").val()
var HFIFOWHID = $("#HFIFOWHID").val()
var HPlanMode = $("#HPlanMode").val()
+ if (HPPQty == "") {
+ HPPQty = 0;
+ }
$.ajax({
url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json",
type: "GET",
data: { "sInterID": sInterID, "sBillNo": sBillNo, "HBillType": '1204', "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "sMaker": sessionStorage["HUserName"], "sPPQty": HPPQty, "sPlanMode": HPlanMode, "sFIFOWHID": HFIFOWHID, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
$("#HPlanMode").attr("disabled", "true");
$("#HBillType").attr("disabled", "true");
element.tabChange('tab-MateOutBill', '2');
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastCheck.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastCheck.html"
new file mode 100644
index 0000000..e09a5b2
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastCheck.html"
@@ -0,0 +1,1031 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>棰嗘枡鍑哄簱鏍￠獙</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <style>
+ .layui-table-cell {
+ height: auto;
+ white-space: normal;
+ }
+
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>棰嗘枡鍑哄簱鏍￠獙</span>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs5">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-col-xs12" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鐗╂枡娓呭崟</li>
+ <li lay-id="3" style="padding:1px;">鍚堣淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--婧愬崟淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs8">
+ <select name="HBillType" id="HBillType">
+ <option value="1103">鏀舵枡閫氱煡鍗�</option>
+ <option value="1102">閲囪喘璁㈠崟</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鐗╂枡娓呭崟-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--鍚堣淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎬绘暟閲�</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ュ織</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HNote" id="HNote" lay-verify="HNote" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //娓呯┖鐣岄潰 new
+
+
+ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+ $("#HWHID").val(sessionStorage["HWHID"]);
+ $("#HWHNAME").val(sessionStorage["HWHName"]);
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ //$("#HSupID").val(sessionStorage["HSupID"]);
+ //$("#HSupName").val(sessionStorage["HSupName"]);
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+ $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
+ $("#HSecManager").val(sessionStorage["HSecManager"]);
+ $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+ $("#HKeeper").val(sessionStorage["HKeeper"]);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMaker").hide();
+ $("#HMakerID").hide();
+ $("#HBillerID").val(sessionStorage["HBillerID"]);
+ $("#HBillerID").hide();
+ //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+ //鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetPonderationBill",
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (d) {
+ // console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HBillType").val(d.data[0].HSourceBillType);
+ $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+ //$("#HWHID").val(d.data[0].HWhID);
+ //$("#HKeeperID").val(d.data[0].HKeeperID);
+ //$("#HSecManagerID").val(d.data[0].HSecManagerID);
+ //$("#HDeptID").val(d.data[0].HDeptID);
+ //$("#HBarCode").val(d.data[0].HBarCode);
+ //$("#HQty").val(d.data[0].HQty);
+ HSourceFlag = true;
+ RoadSup();
+ }
+ })
+ }
+ //鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
+ function RoadSup() {
+ //var sInterID = $("#HInterID").val()
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var HSourceBillType = $("#HBillType").val()
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (HSourceBillNo == "" || sInterID <= 0) {
+ layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ else {
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBill/get_GetCg_POOrderBillList",
+ type: "GET",
+ data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSupID").val(result.data[0].HSupID);
+ $("#HSupName").val(result.data[0].HSupName);
+ $("#HDeptID").val(result.data[0].HDeptID);
+ $("#HDeptName").val(result.data[0].HDeptName);
+ sessionStorage["SourceFlag"] = true;
+ element.tabChange('tab-POStockInBill', '2');
+ layer.load(3);
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ }
+ //鍔犺浇琛ㄤ綋
+ function RoadBillSub(linterid) {
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+ , where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+ , { field: 'HBatchNo', title: '鎵规', sort: true, width: 200 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+
+ //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ //url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ type: "GET",
+ data: { "HBillType": '1201' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(linterid);
+ RoadBillSub(linterid);
+ RoadSup();
+ }
+ //濡傛灉淇敼鍒欒蛋涓嬮潰 new
+
+
+
+
+ //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣 new
+ if (1 == 2) {
+ element.tabChange('tab-POStockInBill', '3');
+ var pFocus = $("#HBarCode");
+ pFocus.focus();
+ pFocus.select();
+ }
+ else {
+ element.tabChange('tab-POStockInBill', '1');
+ var pFocus = $("#HSourceBillNo");
+ pFocus.focus();
+ pFocus.select();
+ }
+ //
+ ////閫夋嫨璋冨叆浠撳簱
+ form.on('submit(HWHID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //閫夋嫨璋冨叆浠撲綅
+ form.on('submit(HSpID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //閫夋嫨渚涘簲鍟�
+ form.on('submit(HSupID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '渚涘簲鍟嗗垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //閫夋嫨淇濈
+ form.on('submit(HKeeperID-BT)', function () {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/UserInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeper").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+ //閫夋嫨鍙戣揣
+ form.on('submit(HSecManagerID-BT)', function (data) {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/UserInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSecManager").val(checkStatus.data[0].HName);
+ $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+ //閫夋嫨閮ㄩ棬
+ form.on('submit(HDeptID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ sessionStorage["SourceFlag"] = false;
+ parent.location.href = "../../../views/index.html"
+ //window.close();//鍏抽棴褰撳墠椤�
+ })
+ //缂栬緫
+ form.on('submit(cmdModify)', function () {
+ var sSubStr = table.cache['wl-table'];
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏄庣粏鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ // }
+ });
+ //鍒犻櫎
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ // console.log(data);
+ var sInterID = $('#HInterID').val()
+ var sMaterID = data[0].HMaterID
+ var sBillType = '1201'
+ var sAuxPropID = data[0].HAuxPropID
+ //var sMTONo = data[0].HMTONo
+ var sMTONo = ''
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+ $.ajax(
+ {
+ type: "Get",
+ //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/POStockInBill/Delete_Json",
+ async: true,
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": '1103', },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //layer.msg(data.Message, { icon: 1 });
+ table.render({
+ elem: '#wl-table'
+ //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Mate_Webs_Json'
+ //, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Mate_Webs_Json'
+ , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+ , cellMinWidth: 80
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: 'HBatchNo', title: '鎵规', width: 200 }
+ , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 200 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 200 }
+ ]]
+ , height: 500
+ })
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ if ($("#HExplanation").val() == "") {
+ if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+ $("#HWHNAME").val("");
+ $("#HWHID").val("");
+ layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = table.cache['wl-table'];
+ var sSourceType = $("#HBillType").val();
+ if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
+ {
+ layer.load(3);
+ $.ajax(
+ {
+ type: "POST",
+ //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/POStockInBill/set_SavePOStockInBill_Json",
+ async: true,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ sessionStorage["SourceFlag"] = false;
+ layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
+ icon: 1,
+ skin: 'layui-layer-lan',
+ closeBtn: 0,
+ btn: ['纭'],
+ btn2: function () {
+ //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ //window.location.reload();//鏂板
+ parent.location.href = "../../../views/index.html"
+ }//鍏抽棴
+ }
+ , function () { parent.location.href = "../../../views/index.html"; }//鏂板
+ );
+ }
+ else {
+ //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ layui.form.render();
+ },
+ error: function (err) {
+ //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ return false;
+ }
+ });
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var sQty = $("#HQty").val();
+ if (sQty == "") {
+ sQty = 0;
+ }
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+ //纭畾
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+
+
+ //鎵簮鍗�
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+ //纭畾
+ form.on('submit(QueDin2)', function (data) {
+ GetMeesageBySourceBillNo();
+ });
+
+
+
+ //鎵粨浣�
+ $('#HStockPlaceName').on('keydown', function (event) {
+ var HBarCode = $('#HStockPlaceName').val()
+ if (event.keyCode == 13) {
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HStockPlaceName").val(result.data[0].HName);
+ $("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HWHID").val(result.data[0].HWHID);
+ $("#HWHNAME").val(result.data[0].HWhName);
+ element.tabChange('tab-POStockInBill', '2');
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+ }
+ });
+ //鍒锋柊鏄庣粏椤电
+ table.render({
+ elem: '#mx-table'
+ // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+ //, toolbar: '#toolbarDemo'
+ // , where: { sMsg: linterid, sMsg2: lentryid }
+ , cols: [[
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ ]]
+ , page: true
+ , height: 500
+ , done: function () {
+ }
+ });
+
+ //鎵玀ES浠撲綅
+ $('#HMESSPName').on('keydown', function (event) { //鎵粨浣�
+ var HBarCode = $('#HMESSPName').val();
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HMESSPID").val(result.data[0].HWHID);
+ $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+ $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+ type: "GET",
+ data: { "HERPWHID": result.data[0].HWHID },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HWHID").val(result.data[0].HMESWHID);
+ $("#HWHNAME").val(result.data[0].HMESWHNAME);
+ $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+ $("#HMESSPName").css("background-color", "#efefef4d");
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ var sSubStr = table.cache['wl-table'];
+ var sBarCode = $('#HBarCode').val()
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var sQty = $("#HQty").val()
+ var sHBillType = $("#HBillType").val() //婧愬崟绫诲瀷
+ var sBillType = '1201'
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+ var sSourceBillNo = $("#HSourceBillNo").val()
+ var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
+ var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
+
+ if (sQty == "") {
+ sQty = 0;
+ }
+
+ //鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ if (sQty != "") {
+ $('#HQty').val("");
+ }
+ if (sHWHID == "184154") {
+ if (sHSPID == "0") {
+ playSound();
+ layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
+ type: "GET",
+ data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": true, "sSourceBillNo": sSourceBillNo, "sSourceType": '1103', "HOWNERID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) {
+ playSound1();
+ if (result.data.HBarType == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HStockPlaceName").val("");
+ $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+ element.tabChange('tab-POStockInBill', '2'); //璺宠浆椤电
+ }
+ else if (result.data.HBarType == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.HSPName);
+ $("#HStockPlaceID").val(result.data.HSPID);
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+ element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+ }
+ else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.HDeptName);
+ $("#HDeptID").val(result.data.HDeptID);
+ $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+ element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+ }
+ else if (result.data.HBarType == '婧愬崟鏉＄爜') {
+ $("#HSupName").val(result.data.HSupName);
+ $("#HSupID").val(result.data.HSupID);
+ $("#HDeptName").val(result.data.HDeptName);
+ $("#HDeptID").val(result.data.HDeptID);
+ $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ sessionStorage["SourceFlag"] = true;
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (result.data.HSourceBillType == "1102") {
+ $("#HBillType").val("1102");
+
+ }
+ else if (result.data.HSourceBillType == "1103") {
+ $("#HBillType").val("1103");
+ }
+ else {
+ $("#HBillType").val("鎵嬪伐褰曞叆");
+ }
+ $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+ element.tabChange('tab-POStockInBill', '3');
+ }
+ else {
+ if (sessionStorage["SourceFlag"] == "true") {
+ element.tabChange('tab-POStockInBill', '3');
+ }
+ else {
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ //$("#HDeptName").val(result.data.HDept);
+ //$("#HDeptID").val(result.data.HDeptID);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ sessionStorage["SourceFlag"] = true;
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (result.data.hSourceBillTypeField == "1102") {
+ $("#HBillType").val("1102");
+ }
+ $("#HNote").val(";鐗╂枡鏉＄爜");
+ element.tabChange('tab-POStockInBill', '3');
+ }
+ }
+
+ layer.load(3)
+ $.ajax({
+ url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ $("#HBarCode_B").val(result.data.list1[0].HBarCode);
+ $("#HMaterName_B").val(result.data.list1[0].HMaterName);
+ $("#HMaterModel_B").val(result.data.list1[0].HMaterModel);
+ $("#HBatchNo_B").val(result.data.list1[0].HBatchNo);
+ $("#HUnitName_B").val(result.data.list1[0].HUnitName);
+ $("#HQty_B").val(result.data.list1[0].HQty);
+ $("#HTMQty_B").val(result.data.list1[0].HTMQty);
+ $("#HWHName_B").val(result.data.list1[0].HWHName);
+ $("#HSPName_B").val(result.data.list1[0].HSPName);
+ }
+ else {
+ layer.msg(result.Message);
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ function playSound() {
+ var audio = document.getElementById("cs");
+ audio.play();
+ }
+ function playSound1() {
+ var audio = document.getElementById("cs2");
+ audio.play();
+ }
+ //鎵簮鍗�
+ function GetMeesageBySourceBillNo(obj) {
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var HSourceBillType = $("#HBillType").val()
+ if (HSourceBillNo == "" || sInterID <= 0) {
+ layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+ url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+ type: "GET",
+ data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSupID").val(result.data[0].HSupID);
+ $("#HSupName").val(result.data[0].HSupName);
+ sessionStorage["SourceFlag"] = true;
+ layer.load(3);
+ element.tabChange('tab-POStockInBill', '2');
+ table.render({
+ elem: '#wl-table'
+ , cellMinWidth: 80
+ //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+ //, toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+ , { field: 'HBatchNo', title: '鎵规' }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ function GetHWHValue(obj) //杩斿洖璋冨叆浠撳簱
+ {
+ $("#HWHNAME").val(obj[0].HName);
+ //sessionStorage["HWHID"] = obj[0].HItemID;
+ $("#HWHID").val(obj[0].HItemID);
+ }
+ function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ }
+ function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
+ }
+ function GetHKeeperValue(obj) { //杩斿洖淇濈
+ $("#HKeeper").val(obj[0].HName);
+ $("#HKeeperID").val(obj[0].HItemID);
+ }
+ function GetHSecManagerValue(obj) { //杩斿洖楠屾敹
+ $("#HSecManager").val(obj[0].HName);
+ $("#HSecManagerID").val(obj[0].HItemID);
+ }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ function AllowLoadData(sSubStr, bnt) { //闈炵┖楠岃瘉
+ //if ($("#HSourceBillNo").val() == '') {
+ // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+ // return false;
+ //}
+ if ($("#HDeptName").val() == '') {
+ layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HSecManager").val() == '') {
+ layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HKeeper").val() == '') {
+ layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ //if ($("#HSupName").val() == '') {
+ // layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+ // return false;
+ //}
+ //if ($("#HWHNAME").val() == '') {
+ // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ if ($("#HBillNo").val() == '') {
+ layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HInterID").val() == '') {
+ layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (typeof (sSubStr) == "undefined") {
+ //layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (bnt == 'Saver') {
+ if (!typeof (sSubStr) == "undefined") {
+ //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+ // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+ // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+ // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+ // return false;
+ // }
+ // }
+ //}
+ for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ if (parseFloat(sSubStr[i].HQty) > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
+ }
+ else {
+ return true;
+ }
+ }
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 7c3d54f..4bfdfd3 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -35,6 +35,14 @@
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-ProductlnBill">
@@ -43,26 +51,42 @@
<li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
<li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
<li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
- <!--<li lay-id="5">鏃ュ織</li>-->
+ <li lay-id="5" style="padding:1px;">鍚堣淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
+ <!--<div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" value="鐢熶骇璁㈠崟" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
+ <input type="hidden" value="3710" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
+ <!--<input type="text" value="鐢熶骇姹囨姤鍗�" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
+ <input type=-->
+ <!--"hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
+ <!--<select name="HBillType" id="HBillType">
+ <option value="3711">鐢熶骇姹囨姤鍗�</option>
+ </select>-->
+ <!--</div>
+ </div>-->
+
+
<div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
</div>
<div class="layui-col-xs8">
- <input type="text" value="鐢熶骇璁㈠崟" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
- <input type="hidden" value="3710" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
- <!--<input type="text" value="鐢熶骇姹囨姤鍗�" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
- <input type=-->
- <!--"hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
- <!--<select name="HBillType" id="HBillType">
+ <select name="HBillType" id="HBillType">
+ <option value="3710">鐢熶骇璁㈠崟</option>
<option value="3711">鐢熶骇姹囨姤鍗�</option>
- </select>-->
+ </select>
</div>
</div>
+
+
+
</div>
<div class="layui-form-item">
<div class="layui-row">
@@ -175,32 +199,67 @@
</div>
</div>
</div>
+
+
+
+
+
+
+
<div class="layui-tab-item">
<!--<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>-->
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>-->
<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" value="0" autocomplete="off" class="layui-input">
- </div>
- </div>
+ <!--<div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>-->
</div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
<div class="layui-tab-item">
<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
</div>
+
+ <!--鏄庣粏娓呭崟-->
+ <div class="layui-tab-item">
+ <!-- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>-->
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜鏁�</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCodeQtys" id="HBarCodeQtys" lay-verify="HBarCodeQtys" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鎬绘暟閲�</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
<div class="layui-tab-item">
<table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
</div>
@@ -225,7 +284,7 @@
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
- <!-- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>-->
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
</div>
<div id="" style="display:none;">
@@ -339,12 +398,12 @@
return vars;
}
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../user/login.html"; });
- }
+ ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
var params = getUrlVars();
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
@@ -374,6 +433,13 @@
function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
{
+ //var checkStatus = table.checkStatus('wl-table')
+ // , data = checkStatus.data;
+ //var sInterID = $('#HInterID').val()
+ //var sBillNo = $("#HBillNo").val()
+ //var sMouldManagerCtl = 'N'
+ //var sFIFOCtl = 'N'
+
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
var sInterID = $("#HInterID").val();
@@ -403,6 +469,38 @@
layer.closeAll("loading");
}
});
+
+
+
+
+ //$.ajax({
+ // url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json',
+ // type: "GET",
+ // data: { HBillID: sInterID, HBillType: '1202', sWhere: '' },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.list;
+ // table.render(listOption);
+
+ // //console.log(result.data.list2);
+ // var count = 0;
+ // var count1 = 0;
+ // for (var i = 0; i < result.data.list.length; i++) {
+ // count += result.data.list[i].HQty;
+ // count1 += result.data.list[i].HPieceQty;
+ // }
+ // $("#HSumQtys").val(count);
+ // $("#HBarCodeQtys").val(count1);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ //});
+
+
}
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
@@ -613,6 +711,93 @@
//window.close();//鍏抽棴褰撳墠椤�
})
+ ////鍒犻櫎
+ //form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ // var checkStatus = table.checkStatus('wl-table')
+ // , data = checkStatus.data;
+ // var sInterID = $('#HInterID').val()
+ // var sMaterID = data[0].HMaterID
+ // var sBillType = '1202'
+ // var sAuxPropID = data[0].HAuxPropID
+ // //var sMTONo = data[0].HMTONo
+ // var sMTONo = ''
+ // var sSourceInterID = data[0].HSourceInterID
+ // var sSourceEntryID = data[0].HSourceEntryID
+ // var HBillNo = $("#HBillNo").val()
+ // var sMouldManagerCtl = 'N'
+ // var sFIFOCtl = 'N'
+ // $.ajax(
+ // {
+ // type: "Get",
+ // //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
+ // async: true,
+ // data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+ // dataType: "json",
+ // success: function (data) {
+ // if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ // // table.render({
+ // // elem: '#wl-table'
+ // // //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
+ // // , url: GetWEBURL() + '/ProductIn/DisPlayBarCodeList_Json'
+ // //, cellMinWidth: 80
+ // //, toolbar: '#toolbarDemo'
+ // // , where: { HBillID: sInterID, HBillNo: HBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl}
+ // //, cols: [[
+ // // { type: 'radio' }
+ // // , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ // // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+ // // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ // // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ // // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+ // // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+ // // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ // // , { field: 'HBatchNo', title: '鎵规', width: 100 }
+ // // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+ // // , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+ // // , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
+ // //]]
+ // //, height: 500
+ // // })
+ // table.render({
+ // elem: '#wl-table'
+ // //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+ // , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , defaultToolbar: []
+ // , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // ]]
+ // // , data: [linterid]
+ // // , page: true
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ // })
+ // }
+ // else {
+ // layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // },
+ // error: function (err) {
+ // layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // });
+ //});
+
+
//鍒犻櫎
form.on('submit(cmdDelete)', function () {//鍒犻櫎
var checkStatus = table.checkStatus('wl-table')
@@ -625,7 +810,7 @@
var sMTONo = ''
var sSourceInterID = data[0].HSourceInterID
var sSourceEntryID = data[0].HSourceEntryID
- var HBillNo = $("#HBillNo").val()
+ var sBillNo = $("#HBillNo").val()
var sMouldManagerCtl = 'N'
var sFIFOCtl = 'N'
$.ajax(
@@ -637,57 +822,33 @@
data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
dataType: "json",
success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- // table.render({
- // elem: '#wl-table'
- // //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
- // , url: GetWEBURL() + '/ProductIn/DisPlayBarCodeList_Json'
- //, cellMinWidth: 80
- //, toolbar: '#toolbarDemo'
- // , where: { HBillID: sInterID, HBillNo: HBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl}
- //, cols: [[
- // { type: 'radio' }
- // , { field: 'HQty', title: '鏁伴噺', width: 80 }
- // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
- // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
- // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
- // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
- // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- // , { field: 'HBatchNo', title: '鎵规', width: 100 }
- // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
- // , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
- // , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
- //]]
- //, height: 500
- // })
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , defaultToolbar: []
- , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
+ if (data.count == 1) {
+ $.ajax({
+ url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
layer.closeAll("loading");
}
- })
+ });
}
else {
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -874,7 +1035,7 @@
}
});
-
+
//鎵潯鐮�
function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
var sOldBarCode = $('#HBarCode').val()
@@ -889,6 +1050,8 @@
var sHWHID = $("#HWHID").val()
var sHSPID = $("#HStockPlaceID").val()
var sSourceBillNo = $("#HSourceBillNo").val()
+ var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
+ var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
if (HDeleteFlag == "*") {
if (sBarCode != "") {
$('#HBarCode').val("");
@@ -922,6 +1085,7 @@
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
, { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HBarcodeQtys', title: '鏉＄爜鏁伴噺', width: 150 }
]]
// , data: [linterid]
// , page: true
@@ -1003,7 +1167,7 @@
$("#HSupID").val(result.data.HSupID);
$("#HDeptName").val(result.data.HDeptName);
$("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
//if (result.data.HSourceBillType == "3711") {
@@ -1016,25 +1180,41 @@
element.tabChange('tab-ProductlnBill', '3');
}
else {
- if (HSourceFlag == "true") {
+ if (HSourceFlag == true) {
element.tabChange('tab-ProductlnBill', '3');
+ $("#HSourceBillNo").attr("readonly", "readonly");
}
else {
$("#HSupName").val(result.data.HSupName);
$("#HSupID").val(result.data.HSupID);
//$("#HDeptName").val(result.data.HDept);
//$("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HBillType").val(result.data.hSourceBillTypeField)
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- //if (result.data.HSourceBillType == "3711") {
- // $("#HBillType").val("3711");
-
- //}
-
- //else {
- // $("#HBillType").val("-1");
- //}
+ if (result.data.hSourceBillTypeField == "3711") {
+ $("#HBillType").empty();
+ $("#HBillType").val("3711");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇姹囨姤鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ if (result.data.hSourceBillTypeField == "3710") {
+ $("#HBillType").empty();
+ $("#HBillType").val("3711");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇璁㈠崟' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ //$("#HBillType").val("-1");
+ }
+ $("#HSourceBillNo").attr("readonly", "readonly");
$("#HNote").val(";鐗╂枡鏉＄爜");
element.tabChange('tab-ProductlnBill', '3');
}
@@ -1044,29 +1224,62 @@
//$("#HDeptID").val(result.data.HDeptID);
//$("#HDeptName").val(result.data.HDeptName);
layer.load(3)
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , defaultToolbar: []
- , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
+ //table.render({
+ // elem: '#wl-table'
+ // //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+ // , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , defaultToolbar: []
+ // , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // ]]
+ // // , data: [linterid]
+ // // , page: true
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+
+ $.ajax({
+ //url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json',
+ //type: "GET",
+ //data: { HBillID: sInterID, HBillType: '1202', sWhere: '' },
+
+ url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ listOption1.data = result.data.list2;
+ table.render(listOption1);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
layer.closeAll("loading");
}
});
@@ -1085,6 +1298,52 @@
});
}
}
+
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ var listOption1 = {
+ elem: '#mx-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+ //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+
function playSound() {
console.log("playSound");
var audio = document.getElementById("cs");
@@ -1113,6 +1372,8 @@
data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HDeptID").val(result.data[0].HDeptID);
+ $("#HDeptName").val(result.data[0].HDeptName);
playSound1();
HSourceFlag = true;
layer.load(3)
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index cc18b08..d77bc81 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -227,6 +227,14 @@
<input type="text" name="HBarCode_B" id="HBarCode_B" lay-verify="HBarCode_B" autocomplete="off" class="layui-input">
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
<div class="layui-form-item" style="padding: 0px; margin: 0px">
<div class="layui-row">
@@ -316,7 +324,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜鏁伴噺</label>
</div>
<div class="layui-col-xs8 layui-input-inline mobile">
- <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-row">
@@ -396,6 +404,7 @@
$("#HMakerID").hide();
$("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HBillerID").hide();
+ var HSourceFlag = sessionStorage["SourceFlag"];
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
@@ -689,41 +698,42 @@
var sMTONo = ''
var sSourceInterID = data[0].HSourceInterID
var sSourceEntryID = data[0].HSourceEntryID
+ var sMouldManagerCtl = 'N'
+ var sFIFOCtl = 'N'
$.ajax(
{
type: "Get",
- //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/POStockInBill/Delete_Json",
+ //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
async: true,
- data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": '1103', },
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
dataType: "json",
success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //layer.msg(data.Message, { icon: 1 });
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Mate_Webs_Json'
- //, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Mate_Webs_Json'
- , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
- , cellMinWidth: 80
- , toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 200 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: 'HBatchNo', title: '鎵规', width: 200 }
- , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 200 }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 200 }
- ]]
- , height: 500
- })
+ if (data.count == 1) {
+ $.ajax({
+ url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
+ layer.closeAll("loading");
+ }
+ });
}
else {
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -957,7 +967,7 @@
$.ajax({
url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": true, "sSourceBillNo": sSourceBillNo, "sSourceType": '1103', "HOWNERID": sessionStorage["OrganizationID"] },
+ data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
playSound1();
@@ -987,7 +997,8 @@
$("#HSupID").val(result.data.HSupID);
$("#HDeptName").val(result.data.HDeptName);
$("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HBillType").val(result.data.hSourceBillTypeField)
sessionStorage["SourceFlag"] = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.HSourceBillType == "1102") {
@@ -1004,7 +1015,7 @@
element.tabChange('tab-POStockInBill', '3');
}
else {
- if (sessionStorage["SourceFlag"] == "true") {
+ if (HSourceFlag == true) {
element.tabChange('tab-POStockInBill', '3');
}
else {
@@ -1013,11 +1024,31 @@
//$("#HDeptName").val(result.data.HDept);
//$("#HDeptID").val(result.data.HDeptID);
$("#HSourceBillNo").val(result.data.hSourceBillNoField);
- sessionStorage["SourceFlag"] = true;
+ $("#HBillType").val(result.data.hSourceBillTypeField)
+ HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.hSourceBillTypeField == "1102") {
+ $("#HBillType").empty();
$("#HBillType").val("1102");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '閲囪喘璁㈠崟' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
+ if (result.data.hSourceBillTypeField == "1103") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1103");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鏀舵枡閫氱煡鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ //$("#HBillType").val("-1");
+ }
+ $("#HSourceBillNo").attr("readonly", "readonly");
$("#HNote").val(";鐗╂枡鏉＄爜");
element.tabChange('tab-POStockInBill', '3');
}
@@ -1032,15 +1063,24 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
listOption.data = result.data.list;
table.render(listOption);
- $("#HBarCode_B").val(result.data.list1[0].HBarCode);
- $("#HMaterName_B").val(result.data.list1[0].HMaterName);
- $("#HMaterModel_B").val(result.data.list1[0].HMaterModel);
- $("#HBatchNo_B").val(result.data.list1[0].HBatchNo);
- $("#HUnitName_B").val(result.data.list1[0].HUnitName);
- $("#HQty_B").val(result.data.list1[0].HQty);
- $("#HTMQty_B").val(result.data.list1[0].HTMQty);
- $("#HWHName_B").val(result.data.list1[0].HWHName);
- $("#HSPName_B").val(result.data.list1[0].HSPName);
+ $("#HBarCode_B").val(result.data.list2[0].HBarCode);
+ $("#HMaterName_B").val(result.data.list2[0].HMaterName);
+ $("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
+ $("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
+ $("#HUnitName_B").val(result.data.list2[0].HUnitName);
+ $("#HQty_B").val(result.data.list2[0].HQty);
+ $("#HTMQty_B").val(result.data.list2[0].HTMQty);
+ $("#HWHName_B").val(result.data.list2[0].HWHName);
+ $("#HSPName_B").val(result.data.list2[0].HSPName);
+
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
}
else {
layer.msg(result.Message);
@@ -1073,6 +1113,7 @@
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
, { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
]]
, height: 500
, done: function () {
--
Gitblit v1.9.1