YL
2021-09-08 8b606056c56f96979777c0a73710a4f408366439
报工台上料防错单页面
5个文件已修改
575 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html 518 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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|2021-09-03T11:10:12.7592659Z;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|2021-09-07T14:57:47.5869531Z;True|2021-09-07T15:20:51.8519604+08:00;True|2021-09-06T08:25:02.3118118+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">
@@ -15,10 +15,10 @@
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>09/03/2021 19:09:58</publishTime>
      <publishTime>09/07/2021 22:57:34</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>09/03/2021 19:09:58</publishTime>
      <publishTime>09/07/2021 22:57:34</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>06/10/2021 11:10:38</publishTime>
@@ -639,7 +639,7 @@
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>09/03/2021 15:17:58</publishTime>
      <publishTime>09/04/2021 21:15:12</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>06/10/2021 11:10:38</publishTime>
@@ -1725,7 +1725,7 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html">
      <publishTime>08/25/2021 13:03:47</publishTime>
      <publishTime>09/07/2021 10:25:45</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1815,7 +1815,7 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html">
      <publishTime>08/25/2021 13:03:47</publishTime>
      <publishTime>09/07/2021 10:25:45</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1947,10 +1947,10 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html">
      <publishTime>09/03/2021 19:09:56</publishTime>
      <publishTime>09/07/2021 22:46:23</publishTime>
    </File>
    <File Include="views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html">
      <publishTime>08/18/2021 23:13:18</publishTime>
      <publishTime>09/07/2021 15:58:33</publishTime>
    </File>
    <File Include="views/生产管理/产量汇报单/Sc_ProductReportBillList.html">
      <publishTime>09/03/2021 10:26:59</publishTime>
@@ -2034,7 +2034,7 @@
      <publishTime>06/28/2021 17:33:57</publishTime>
    </File>
    <File Include="views/生产管理/质量汇报单/Sc_QualityReportBill.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/生产管理/质量汇报单/Sc_QualityReportBillList.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
@@ -2106,7 +2106,7 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillEdit.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillList.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
@@ -2115,10 +2115,10 @@
      <publishTime>06/29/2021 11:09:03</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillEdit.html">
      <publishTime>08/24/2021 19:38:55</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillList.html">
      <publishTime>08/24/2021 19:38:55</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainBillEdit.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2157,7 +2157,7 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2178,7 +2178,7 @@
      <publishTime>07/20/2021 01:15:26</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
@@ -2202,16 +2202,16 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillEdit.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillList.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillEdit.html">
      <publishTime>08/24/2021 19:38:55</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillList.html">
      <publishTime>08/24/2021 19:38:55</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainBillEdit.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2244,7 +2244,7 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2262,7 +2262,7 @@
      <publishTime>08/20/2021 14:12:37</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:14:33</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
@@ -2289,10 +2289,10 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBill.html">
      <publishTime>07/20/2021 01:15:26</publishTime>
      <publishTime>09/04/2021 20:58:41</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBillList.html">
      <publishTime>08/27/2021 17:42:44</publishTime>
      <publishTime>09/04/2021 17:39:15</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
@@ -2325,16 +2325,16 @@
      <publishTime>05/17/2021 19:07:00</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBill.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/06/2021 12:10:56</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:07:13</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBill.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/06/2021 12:10:56</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
      <publishTime>09/04/2021 21:07:13</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Sc_StationInBill_Mul.html">
      <publishTime>09/03/2021 15:17:04</publishTime>
@@ -2541,7 +2541,7 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>09/03/2021 19:10:08</publishTime>
      <publishTime>09/07/2021 22:57:44</publishTime>
    </File>
  </ItemGroup>
</Project>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainBillList.html
@@ -900,7 +900,7 @@
                        option2.data = table.cache["mainTable1"];//将数据绑定到data上
                        obj.del();
                        option2.data.splice(rowIndex, 1);//删除缓存的行
                        table.reload('mainTable', option2);
                        table.reload('mainTable1', option2);
                        layer.close(index);
                    });
                }
WebTM/views/Éú²ú¹ÜÀí/ÉÏÁÏ·À´íµ¥/Sc_Add_MaterToSourceBillList.html
@@ -101,6 +101,7 @@
                            <div class="layui-btn-group">
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">反审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -112,7 +113,7 @@
                                    <div class="layui-row" style="margin:10px auto;">
                                        <label class="layui-form-label" style="width: 85px;text-align:left;"><span style="color:red;">*</span>条形码</label>
                                        <div class="layui-input-block" style="margin-left: 100px;">
                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                                            <input type="text" name="HBarCode" id="HBarCode"  placeholder="请键入后回车" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-tab layui-tab-card">
@@ -326,6 +327,22 @@
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeleteLine"><i class="layui-icon layui-icon-form"></i>删行</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeleteLine1"><i class="layui-icon layui-icon-form"></i>删行</button>
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                        <script type="text/html" id="xuhao1">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                    </form>
                </div>
            </div>
@@ -339,6 +356,7 @@
        var HSourceBillNo = "";   //源单单号
        var HSourceBillType = "";  //源单类型
        var refSav = "";   //提交类型
        var tableBak = []; //备料列表数据临时数组
        //获取页面跳转参数  //单据编辑状态: 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
@@ -372,11 +390,16 @@
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            var option;
            var option2;
            //#endregion
            //初始化表单插件
            set_InitFrom();
            //初始化表格
            set_InitGrid();
            //判断操作类型
            if (OperationType == 1) {//无源单
@@ -422,6 +445,70 @@
                });
            }
            //初始化表格
            function set_InitGrid() {
                Table1();  //保养项列表
                Table2();  //配件项列表
            }
            //初始化保养项列表
            function Table1() {
                //表头
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HMaterID', title: '物料ID', edit: 'text', hide: true }
                    , { field: 'HNumber', title: '物料代码', edit: 'text' }
                    , { field: 'HName', title: '物料名称', edit: 'text' }
                    , { field: 'HModel', title: '规格型号', edit: 'text' }
                    , { field: 'HUnitID', title: '单位ID', edit: 'text', hide: true }
                    , { field: 'HUnitName', title: '单位', edit: 'text' }
                    , { field: 'HModel', title: '规格型号', edit: 'text' }
                    , { field: 'HMQty', title: '配料数量', edit: 'text' }
                    , { field: 'HQty', title: '实配数量', edit: 'text' }
                ];
                option = {
                    id: 'mainTable'
                    , elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , defaultToolbar: false  //是否显示右侧工具栏
                    , page: false
                    , cellMinWidth: 120
                    , height: 350
                    , cols: [columns]
                    , done: function (res, curr, count) {
                    }
                };
            }
            //初始化配件项列表
            function Table2() {
                //表头
                columns1 = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao1', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HMouldID', title: '治具ID', edit: 'text', hide: true}
                    , { field: 'HMouldNumber', title: '治具代码', edit: 'text' }
                    , { field: 'HMouldName', title: '治具名称', edit: 'text' }
                    , { field: 'HMouldSpec', title: '规格型号', edit: 'text' }
                ];
                option2 = {
                    id: 'mainTable1'
                    , elem: '#mainTable1'
                    , toolbar: '#toolbarDemo1'
                    , defaultToolbar: false  //是否显示右侧工具栏
                    , page: false
                    , cellMinWidth: 120
                    , height: 350
                    , cols: [columns1]
                    , done: function (res, curr, count) {
                    }
                };
            }
            //无源单新增
            function set_AddFNew()
            {
@@ -431,10 +518,99 @@
            //有源单新增
            function set_AddNew() {
                get_MAXNum();
                set_SourceAdd();
                option.data = [];
                option2.data = [];
                table.render(option);
                table.render(option2);
            }
            //编辑
            function set_EditFromGrid()
            {
                $("#HInterID").val(linterid);//修改时主表ID
                refSav = "Update";
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HBeginDate').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMainSourceBillNo').attr("disabled", true);
                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#SourceType').attr("disabled", true);
                form.render('select');
                $('#HICMOBillNo').attr("disabled", true);
                $.ajax({
                    url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
                    type: "GET",
                    data: {
                        "HID": linterid
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HInterID": data.hmainid
                                , "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HProcID": data.HProcID
                                , "HProcName": data.工序名称
                                , "HMaterID": data.HMaterID
                                , "HMaterCode": data.产品代码
                                , "HMaterName": data.产品名称
                                , "HMaterSpec": data.规格型号
                                , "HBeginDate": data.开工时间
                                , "HSourceID": data.HSourceID              //资源ID
                                , "HSourceName": data.资源名称             //资源名称
                                , "HEmpID": data.HEmpID                   //操作员ID
                                , "HEmpName": data.申请开工人员           //操作员
                                , "HMainSourceInterID": data.HMainSourceInterID                 //源单ID
                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //源单子ID
                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //源单单号
                                , "HMainSourceBillType": data.HMainSourceBillType               //源单类型
                                , "HGroupID": data.HGroupID                //班组ID
                                , "HGroupName": data.班组名称              //班组名称
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOEntryID": data.HICMOEntryID                        //生产订单子ID
                                , "HICMOBillNo": data.HICMOBillNo                        //生产订单
                                , "HRemark": data.备注                    //备注
                                , "HMaker": data.制单人                            //制单人
                                , "HMakeDate": data.制单日期                          //制单日期
                                , "HUpDater": sessionStorage["HUserName"]             //修改人
                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//修改日期
                                , "HChecker": data.审核人             //审核人
                                , "HCheckDate": data.审核日期   //审核日期
                                , "HCloseMan": data.关闭人                //关闭人
                                , "HCloseDate": data.关闭日期             //关闭日期
                                , "HDeleteMan": data.作废人               //作废人
                                , "HDeleteDate": data.作废日期       //作废日期
                            });
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }
            //有源单新增
            function set_SourceAdd() {
                refSav = "Add";
                 //初始基本信息赋值
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //报工日期
                $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //报工日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
@@ -444,7 +620,7 @@
                $('#HProcExchBillNo').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled",true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HPlanQty').attr("disabled", true);
@@ -501,87 +677,8 @@
                    });
            }
            //编辑
            function set_EditFromGrid()
            {
                refSav = "Update";
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HBeginDate').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMainSourceBillNo').attr("disabled", true);
                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HDeptName').attr("disabled", true);
                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#SourceType').attr("disabled", true);
                form.render('select');
                $('#HICMOBillNo').attr("disabled", true);
                $.ajax({
                    url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
                    type: "GET",
                    data: {
                        "HID": linterid
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HInterID": data.hmainid
                                , "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HProcID": data.HProcID
                                , "HProcName": data.工序名称
                                , "HMaterID": data.HMaterID
                                , "HMaterCode": data.产品代码
                                , "HMaterName": data.产品名称
                                , "HMaterSpec": data.规格型号
                                , "HBeginDate": data.开工时间
                                , "HSourceID": data.HSourceID              //资源ID
                                , "HSourceName": data.资源名称             //资源名称
                                , "HEmpID": data.HEmpID                   //操作员ID
                                , "HEmpName": data.申请开工人员           //操作员
                                , "HMainSourceInterID": data.HMainSourceInterID                 //源单ID
                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //源单子ID
                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //源单单号
                                , "HMainSourceBillType": data.HMainSourceBillType               //源单类型
                                , "HGroupID": data.HGroupID                //班组ID
                                , "HGroupName": data.班组名称              //班组名称
                                , "HDeptID": data.HDeptID                  //部门ID
                                , "HDeptName": data.部门名称               //部门名称
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOEntryID": data.HICMOEntryID                        //生产订单子ID
                                , "HICMOBillNo": data.HICMOBillNo                        //生产订单
                                , "HRemark": data.备注                    //备注
                                , "HMaker": data.制单人                            //制单人
                                , "HMakeDate": data.制单日期                          //制单日期
                                , "HUpDater": sessionStorage["HUserName"]             //修改人
                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//修改日期
                                , "HChecker": data.审核人             //审核人
                                , "HCheckDate": data.审核日期   //审核日期
                                , "HCloseMan": data.关闭人                //关闭人
                                , "HCloseDate": data.关闭日期             //关闭日期
                                , "HDeleteMan": data.作废人               //作废人
                                , "HDeleteDate": data.作废日期       //作废日期
                            });
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }
            //判断是否新增
            if (linterid == null || linterid == 0) {
            //获取最大单据号及默认值赋值
            function get_MAXNum() {
                //获取最大单据号 new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
@@ -595,47 +692,23 @@
                    }
                });
            }
            else {//如果修改则走下面 new
                $("#HInterID").val(linterid);//修改时主表ID
            }
              //获取下拉选中值
            form.on('select(SourceType)', function (data) {
                Sctag = data.value;
                form.render('select');
                if (Sctag != "2")  //无源单
                {
                    $("#HMainSourceInterID").val("");
                    $("#HMainSourceEntryID").val("");
                    $("#HMainSourceBillNo").val("");
                    $("#HMainSourceBillType").val("");
                    $('#HMainSourceBillNo').attr("disabled", false);
                    $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
                    OperationType = 1;
                }
                else {
                    $('#HMainSourceBillNo').attr("disabled", true);
                    $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
                    OperationType = 2;
                }
            });
            //保存提交
            form.on('submit(Saver)', function (data) {
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//数据验证
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
                if (!AllowLoadData(sSubStr, sSubStr1))//数据验证
                {
                    return false;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //方法所在页面和方法名
                    url: GetWEBURL() + "/Sc_MaterToSourceBill/SaveGetMaterToSourceFrom", //方法所在页面和方法名
                    async: false,
                    data: { "msg": sMainSub },
                    dataType: "json",
@@ -665,16 +738,23 @@
                })
            });
            //审核按钮提交
            //审核
            form.on('submit(VerIfySaver)', function (data) {
                SaveVerify();
            });
            //反审核
            form.on('submit(ReVerIfySaver)', function (data) {
                ReVerIfySaver();
            });
            //审核提交
            function SaveVerify()
            {
                var InterID = $("#HInterID").val();
                if (!AllowLoadData())//数据验证
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                if (!AllowLoadData(sSubStr, sSubStr1))//数据验证
                {
                    return false;
                }
@@ -685,14 +765,42 @@
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
            }
            //反审核提交
            function ReVerIfySaver() {
                var InterID = $("#HInterID").val();
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                if (!AllowLoadData(sSubStr, sSubStr1))//数据验证
                {
                    return false;
                }
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //方法所在页面和方法名
                    async: true,
                    data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
@@ -708,6 +816,67 @@
                window.parent.location.reload();
            });
            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
                var HBarCode = $('#HBarCode').val();
                if (event.keyCode == 13) {
                    if (!HBarCode) {
                        layer.msg("条形码不能为空!")
                        return;
                    }
                    if (HBarCode != "") {
                        $('#HBarCode').val("");
                    }
                    $.ajax({
                        url: GetWEBURL() + "/Sc_MaterToSourceBill/get_CheckTypeByBarCode_Json",
                        type: "GET",
                        data: { "HBarCode": HBarCode, "HSourceID": "111", "HICMOInterID": "100030", "HICMOEntryID": "100050"},
                        success: function (result) {
                            console.info(result);
                            if (result.count == 1) {
                                if (result.Verify == '资源条码') {
                                    $("#HSourceID").val(result.data.Gy_Source[0].HItemID);
                                    $("#HSourceName").val(result.data.Gy_Source[0].HName);
                                }
                                if (result.Verify == '用料清单物料条码')
                                {
                                    //回写用料清单数据列表
                                    // æºæ•°æ®
                                    tableBak = table.cache.mainTable;
                                    console.log(tableBak.length);
                                    //获取物料条码信息
                                    var NewRow = { "HMaterID": result.data[0].HMaterID, "HNumber": result.data[0].HNumber, "HName": result.data[0].HName, "HModel": result.data[0].HModel, "HUnitID": result.data[0].HUnitID, "HUnitName": result.data[0].HUnitName, "HMQty": result.data[0].HMQty, "HQty": result.data[0].HQty };
                                    if (tableBak.length <= 0) {
                                        table.cache["mainTable"].push(NewRow);
                                        option.data = table.cache["mainTable"];
                                        table.render(option);
                                    }
                                    else
                                    {
                                        // åŽ»é‡(不能有相同扫码物料)
                                        for (var i = 0; i < tableBak.length; i++) {
                                            if (tableBak[i].HMaterID == result.data[0].HMaterID) {
                                                layer.msg("已扫描,请勿重复扫码!", { icon: 0, time: 2000 });
                                            }
                                            else {
                                                table.cache["mainTable"].push(NewRow);
                                                option.data = table.cache["mainTable"];
                                                table.render(option);
                                            }
                                        }
                                    }
                                }
                            }
                            else {
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.msg("接口请求失败!" + err, { icon: 5, btn: ['确认'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                }
            });
            //表头信息产品弹窗
            form.on('submit(HMaterList)', function () {
@@ -825,8 +994,6 @@
                });
            });
            //源单单号 XDHList
            //表头信息班组弹窗
            form.on('submit(HGroupList)', function () {
                //页面层-自定义
@@ -903,11 +1070,85 @@
                });
            });
            // å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var rowid = 0;
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                switch (obj.event) {
                    //删除一行
                    case 'btn-DeleteLine': btnDeleteLine(checkStatus,data, obj);
                        break;
                }
            });
            // å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable1)', function (obj) {
                var rowid = 0;
                var checkStatus = table.checkStatus('mainTable1')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable1'];
                switch (obj.event) {
                    //新增一行
                    case 'btn-DeleteLine1': btnDeleteLine1(checkStatus, data, obj);
                        break;
                }
            });
            //删除行
            function btnDeleteLine(checkStatus,data) {
                var tableDT = table.cache.mainTable;//1获取之前编辑过的全部数据,前提是编辑数据是要更新缓存,buttonList ä¸ºè¡¨æ ¼çš„id
                var data = checkStatus.data;//2获取选中数据
                if (data.length <= 0) {
                    layer.msg('最少选择一行');
                    return;
                }
                //方法二:遍历缓存列表,将选中的按钮信息删除(选中的删除)
                var tableArr = [];
                for (var i = 0; i < tableDT.length; i++) {//遍历表格缓存数组
                    var btnObj = tableDT[i];
                    if (btnObj.LAY_CHECKED) {//条件:选中
                        tableDT.splice(i, 1);//移除后后造成数组下标索引发生变化,所以下面需要i--
                        i--;
                    }
                }
                tableArr = tableDT;
                table.reload("mainTable", {
                    data: tableArr   // å°†æ–°æ•°æ®é‡æ–°è½½å…¥è¡¨æ ¼
                });
            }
            //删除行
            function btnDeleteLine1(checkStatus,data) {
                var tableDT = table.cache.mainTable1;//1获取之前编辑过的全部数据,前提是编辑数据是要更新缓存,buttonList ä¸ºè¡¨æ ¼çš„id
                var data = checkStatus.data;//2获取选中数据
                if (data.length <= 0) {
                    layer.msg('最少选择一行');
                    return;
                }
                //方法二:遍历缓存列表,将选中的按钮信息删除(选中的删除)
                var tableArr = [];
                for (var i = 0; i < tableDT.length; i++) {//遍历表格缓存数组
                    var btnObj = tableDT[i];
                    if (btnObj.LAY_CHECKED) {//条件:选中
                        tableDT.splice(i, 1);//移除后后造成数组下标索引发生变化,所以下面需要i--
                        i--;
                    }
                }
                tableArr = tableDT;
                table.reload("mainTable1", {
                    data: tableArr   // å°†æ–°æ•°æ®é‡æ–°è½½å…¥è¡¨æ ¼
                });
            }
            //以上为layui模块
        });
        function AllowLoadData() {  //非空验证
        function AllowLoadData(sSubStr,sSubStr1) {  //非空验证
            var Result = true;
            if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
                layer.msg("单据号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -917,12 +1158,16 @@
                layer.msg("单据日期不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
                layer.msg("产品编码不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            if ($("#HICMOBillNo").val() == '' || $("#HICMOBillNo").val() == null) {
                layer.msg("订单号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HBeginDate").val() == '' || $("#HBeginDate").val() == null) {
                layer.msg("开工时间不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            if ($("#HPlanQty").val() == '' || $("#HPlanQty").val() == null) {
                layer.msg("订单数量不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
                layer.msg("产品编码不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
@@ -937,16 +1182,17 @@
                layer.msg("班组不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                layer.msg("车间不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if (OperationType == "2") {
                if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                    layer.msg("生产订单不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
            }
            if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                layer.msg("配料记录不能为空", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            return Result;
        }
WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_Add_ProductReportBillList.html
@@ -957,7 +957,7 @@
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/MESProductAuditProcessReportList", //方法所在页面和方法名
                    data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html
@@ -810,6 +810,7 @@
                                "HPieceQty": data.流转卡数量,
                                "HPlanQty": data.流转卡数量,
                                "HProcExchBillNo": data.单据号,
                                "aa": data.hmainid,   //流转卡主内码
                                "HICMOQty": data.任务单数量,
                                "lngBillKey": data.hmainid,
                                "HOrderProcNO": data.订单跟踪号