Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

zzr99

2021-09-06 e71fc163d43fccf7f81369b4835df3d29a3ab0d3

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 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-03T07:39:13.3956181Z;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-06T01:33:26.6804733Z;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">
@@ -639,7 +639,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>09/03/2021 15:36:07</publishTime>
      <publishTime>09/06/2021 09:33:17</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1092,7 +1092,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/IpadIndex.html">
      <publishTime>09/03/2021 15:18:56</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/PublicPage/AreaInformation.html">
      <publishTime>08/27/2021 16:49:52</publishTime>
@@ -1425,7 +1425,7 @@
      <publishTime>08/16/2021 17:24:30</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EmployeeList.html">
      <publishTime>09/02/2021 16:08:15</publishTime>
      <publishTime>09/06/2021 09:32:57</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1497,7 +1497,7 @@
      <publishTime>09/02/2021 16:08:15</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html">
      <publishTime>09/02/2021 16:08:15</publishTime>
      <publishTime>09/06/2021 09:32:57</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/HBarPlanPrint.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1542,13 +1542,13 @@
      <publishTime>09/02/2021 16:08:15</publishTime>
    </File>
    <File Include="views/基础资料/工资基础资料/Gy_Group_Add_Edit.html">
      <publishTime>09/02/2021 16:08:15</publishTime>
      <publishTime>09/06/2021 09:32:57</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html">
      <publishTime>09/01/2021 17:19:05</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_Process.html">
      <publishTime>09/02/2021 16:08:15</publishTime>
      <publishTime>09/06/2021 09:32:57</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_Source.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1947,7 +1947,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html">
      <publishTime>09/03/2021 15:18:56</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1968,7 +1968,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>09/02/2021 16:23:22</publishTime>
      <publishTime>09/06/2021 09:32:57</publishTime>
    </File>
    <File Include="views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList - å¤åˆ¶.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -2034,7 +2034,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/生产管理/质量汇报单/Sc_QualityReportBill.html">
      <publishTime>09/03/2021 15:35:34</publishTime>
      <publishTime>09/03/2021 16:41:11</publishTime>
    </File>
    <File Include="views/生产管理/质量汇报单/Sc_QualityReportBillList.html">
      <publishTime>09/02/2021 16:08:15</publishTime>
@@ -2106,7 +2106,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillEdit.html">
      <publishTime>09/02/2021 16:22:05</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillList.html">
      <publishTime>09/02/2021 16:22:05</publishTime>
@@ -2115,10 +2115,10 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillEdit.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillList.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainBillEdit.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -2157,7 +2157,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>09/03/2021 14:12:38</publishTime>
      <publishTime>09/03/2021 16:41:21</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -2178,10 +2178,10 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>09/03/2021 15:38:29</publishTime>
      <publishTime>09/03/2021 16:41:28</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>09/02/2021 16:08:15</publishTime>
      <publishTime>09/06/2021 09:32:57</publishTime>
    </File>
    <File Include="views/设备管理/Sb_Add_EqpConkBookBillList.html">
      <publishTime>09/01/2021 10:26:34</publishTime>
@@ -2202,16 +2202,16 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillEdit.html">
      <publishTime>09/02/2021 16:22:05</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillList.html">
      <publishTime>09/02/2021 16:22:05</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillEdit.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillList.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainBillEdit.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -2244,7 +2244,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>09/03/2021 14:12:38</publishTime>
      <publishTime>09/03/2021 16:41:21</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -2262,10 +2262,10 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>09/03/2021 15:38:29</publishTime>
      <publishTime>09/03/2021 16:41:28</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>09/02/2021 16:08:15</publishTime>
      <publishTime>09/06/2021 09:32:57</publishTime>
    </File>
    <File Include="views/车间管理/不良品评审单/Cj_NoPassProcList.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -2289,10 +2289,10 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBill.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBillList.html">
      <publishTime>08/30/2021 08:44:23</publishTime>
      <publishTime>09/06/2021 09:32:57</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul.html">
      <publishTime>09/03/2021 11:28:59</publishTime>
@@ -2325,16 +2325,16 @@
      <publishTime>05/17/2021 19:07:00</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBill.html">
      <publishTime>09/02/2021 14:09:55</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>09/03/2021 09:13:07</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBill.html">
      <publishTime>09/02/2021 14:09:55</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>09/03/2021 09:13:07</publishTime>
      <publishTime>09/06/2021 08:29:07</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Sc_StationInBill_Mul.html">
      <publishTime>09/03/2021 11:28:08</publishTime>
@@ -2541,7 +2541,7 @@
      <publishTime>08/27/2021 09:06:17</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/30/2021 09:52:57</publishTime>
      <publishTime>09/06/2021 09:33:25</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\Git仓库\MESWMS\LAYUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git仓库\项目\MESWMS\LAYUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/IpadIndex.html

@@ -762,14 +762,10 @@
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        "workcode": workcode,
                        "HSourceID": HSourceID1,
                        "HSourceName": HSourceName1,
                        "HICMOInterID": HICMOInterID,
                        "HICMOEntryID": HICMOEntryID,
                        "HMaker": sessionStorage["HUserName"],    //sessionStorage["HUserName"]
                        "Czybm": sessionStorage["Czybm"],
                        //"HEmpID": "0",    //sessionStorage["HEmpID"]
                        "HBillType": HBillType,
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                    });


 WebTM/views/index.html

@@ -272,13 +272,14 @@
                                        <dd><a lay-href="">物料清单维护n</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillList.html">工艺路线维护</a></dd>
                                <!--<dd>
                                    <a>工艺路线</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBill.html">工艺路线</a></dd>
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillList.html">工艺路线维护</a></dd>
                                    </dl>
                                </dd>
                                </dd>-->
                            </dl>
                        </li>
                        <!-- ç”Ÿäº§ç®¡ç† -->

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_EmployeeList.html

@@ -49,9 +49,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter_Add_Edit.html

@@ -294,7 +294,7 @@
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_WorkCenter/EditBill", //方法所在页面和方法名
                    url: GetWEBURL() + "Gy_WorkCenter/ModifyByID", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr },
                    dataType: "json",

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html

@@ -289,7 +289,7 @@
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Group/EditBill", //方法所在页面和方法名
                    url: GetWEBURL() + "Gy_Group/ModifyByID", //方法所在页面和方法名
                    //url:"http://localhost:30552/Gy_Group/EditBill", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr },

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html

@@ -412,7 +412,7 @@
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Process/EditBill", //方法所在页面和方法名
                    url: GetWEBURL() + "Gy_Process/ModifyByID", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr },
                    dataType: "json",

 WebTM/views/Éú²ú¹ÜÀí/ÉÏÁÏ·À´íµ¥/Sc_Add_MaterToSourceBillList.html

@@ -140,7 +140,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">订单数量:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HWorkQty" id="HWorkQty" disabled autocomplete="off">
                                                            <input class="layui-input" name="HPlanQty" id="HPlanQty" disabled autocomplete="off">
                                                        </div>
                                                    </div>
                                                </div>
@@ -156,7 +156,11 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">流转卡号:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
                                                            <input class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" disabled autocomplete="off">
                                                            <input id="HSourceInterID" name="HSourceInterID" type="hidden" />
                                                            <input id="HSourceEntryID" name="HSourceEntryID" type="hidden" />
                                                            <input type="hidden" name="HSourceBillNo" id="HSourceBillNo">
                                                            <input type="hidden" name="HSourceBillType" id="HSourceBillType">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -171,8 +175,11 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品代码</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" disabled autocomplete="off">
                                                            <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" disabled autocomplete="off">
                                                            <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -193,7 +200,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">流转卡数量:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" disabled autocomplete="off">
                                                            <input class="layui-input" name="HProcExchQty" lay-verify="HProcExchQty" id="HProcExchQty" disabled autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -390,14 +397,6 @@
            function set_InitFrom() {
                //日期时间选择器
                laydate.render({
                    elem: '#HBeginDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HEndDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HDate'
                    , type: 'datetime'
                });
@@ -433,33 +432,31 @@
            //有源单新增
            function set_AddNew() {
                refSav = "Add";
                //初始基本信息赋值
                 //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HBeginDate").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"]);     //制单人

                //加源单类型区分(可以写不同的方法)

                $('#HICMOBillNo').attr("disabled", true);
                $('#HSourceBillNo').attr("disabled", true);
                $('#HProcExchBillNo').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HBeginDate').attr("disabled", true);
                $('#HPlanQty').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);
                $('#HWorkBeginDate').attr("disabled", true);
                $('#HWorkReportDate').attr("disabled", true);

                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //方法所在页面和方法名
                        url: GetWEBURL() + "/Sc_MaterToSourceBill/GetMESMaterToSourceFrom", //方法所在页面和方法名
                        async: true,
                        data: {
                            "HSourceInterID": HSourceInterID,
@@ -480,15 +477,18 @@
                                $("#HMaterSpec").val(LoadData[0].HModel); //产品规格
                                $("#HSourceID").val(LoadData[0].HSourceID); //生产资源ID
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                                $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号（暂时取值订单编号）
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HMainSourceBillType").val(HSourceBillType); //源单类型
                                $("#HDeptID").val(LoadData[0].HDeptID); //车间ID
                                $("#HDeptName").val(LoadData[0].HDeptName); //车间
                                $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号（暂时取值订单编号）
                                $("#HSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HSourceBillType").val(HSourceBillType); //源单类型
                                $("#HGroupID").val(LoadData[0].HDeptID); //班组ID
                                $("#HGroupName").val(LoadData[0].HDeptName); //班组
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //生产订单ID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //生产订单子ID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //生产订单
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //生产订单号
                                $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //开工时间
                                $("#HPlanQty").val(LoadData[0].HDatePlanQty); //订单数量

                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
@@ -585,15 +585,15 @@
                //获取最大单据号 new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                //$.ajax({
                //    url: GetWEBURL() + "/Web/GetMAXNum",
                //    type: "GET",
                //    data: { "HBillType": '3787' },
                //    success: function (d) {
                //        $("#HBillNo").val(d.data[0].HBillNo);
                //        $("#HInterID").val(0);
                //    }
                //});
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3786' },
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
                    }
                });
            }
            else {//如果修改则走下面 new
                $("#HInterID").val(linterid);//修改时主表ID

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -320,26 +320,33 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hmainid = data[0].hmainid;
                    var ajaxLoad = layer.load();
                    //逻辑删除方法
                    $.ajax({
                        url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": hmainid },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_Display(sWhere);
                                layer.close(ajaxLoad);
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(result.Message, { icon: 5 });
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": hmainid },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -376,7 +376,7 @@
            }
            else if (OperationType == 3) {//编辑
                RoadBillMain(linterid);
                RoadBillSub(linterid);
                //RoadBillSub(linterid);
            }
            else if (OperationType == 4) {//浏览

@@ -721,11 +721,14 @@
            //退出按钮
            form.on('submit(Cancel)', function () {
                if (OperationType == 1) {
                    Pub_Close(2);
                    Pub_Close(1);
                }
                else if (OperationType == 2) {
                    Pub_Close(1);
                }
                else if (OperationType == 3) {
                    Pub_Close(1);
                }
            })

        });

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -284,7 +284,7 @@
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '工作中心-新增'
                    , title: '工艺路线-新增'
                    , shift: 0//弹出动画
                    , content: '../工艺路线/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType='
                })
@@ -302,7 +302,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工作中心-编辑'
                        , title: '工艺路线-编辑'
                        , shift: 0//弹出动画
                        , content: '../工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList.html

@@ -8,7 +8,12 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>

@@ -54,10 +59,12 @@
                            </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="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                        </div>
                                     <div class="layui-btn-container">
                                         <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                     </div>
                    </script>
                    </form>
                </div>
@@ -66,10 +73,10 @@
    </div>

    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
    <script>
        var _cur_page = 1;
        var sql = " ";
@@ -138,6 +145,8 @@
            //layui.code();
            RoadHBillNo(sql);
            layer.load(3)
            $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
            //方法级渲染
            table.render({
                elem: '#mainTable'
@@ -187,10 +196,34 @@
            }
            });


            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //#endregion

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HBillNo").val("");
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
                sqlWhere = "";
            }
            //#endregion
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
            
                    case 'btn-getCheckData':
                        var data = checkStatus.data;
                        layer.alert(JSON.stringify(data));
@@ -208,7 +241,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: '../首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?hID=' + hID
                                , content: ['../首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=&HICMOEntryID=0', 'yes']
                                , resize: false
                                , cancel: function () {
                                    //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -225,76 +258,125 @@
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            //逻辑删除方法
                            $.ajax({
                                url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
                                type: "GET",
                                data: { "HInterID": InterID },
                                success: function (result) {
                                    console.log('gouba' + result);
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                        });
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                                var index = layer.load();
                                //逻辑删除方法
                                $.ajax({
                                    url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
                                    type: "GET",
                                    data: { "HInterID": InterID },
                                    success: function (result) {
                                        console.log('gouba' + result);
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                            });

                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                            layer.close(index);
                                        }
                                    }, error: function () {
                                        layer.alert("接口请求失败!", { icon: 5 });
                                        layer.close(index);
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                                });
                            })
                        }
                        else {
                            layer.msg('请选择一行数据删除！');
                        }
                        break;
                        break; 
                    case 'get_Refresh':
                        set_ClearQuery();
                        RoadHBillNo(sqlWhere);
                        break; 
                    case 'get_Exit':
                        Pub_Close(2);
                        break; 
                };
            });



            ///加载显示数据
            //#region æŸ¥è¯¢
            function RoadHBillNo(sqlWhere) {
                where = sqlWhere;
                var ajaxLoad = layer.load();
                $.ajax({
                    type: "get",
                    url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
                    url: GetWEBURL() + "/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
                    async: true,
                    data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
                    success: function (result) {
                        if (result.count == 1) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , page: {
                                curr: _cur_page //必须从第 1 é¡µå¼€å§‹
                            }
                            , loading: false
                            , done: function (index, res) {
                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                            table.reload('mainTable', {
                                data: ajaxReturnData
                                , height: 'full-10'
                                , page: {
                                    curr: _cur_page // å¿…须从第 1 é¡µå¼€å§‹
                                }
                                , loading: false
                                , done: function (index, res) {

                            }
                        });
                        layer.close(index0);
                    } else {
                            layer.close(index0);
                                }
                            });
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.code + result.Message, { icon: 5 });
                    }
                        }

                    },
                    error: function (result) {
                        layer.close(index0);
                    layer.alert("接口请求失败!", { icon: 5 });
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            };
            form.on('submit(f_Query)', function (data) {//查询
            }
            //#endregion

            ///加载显示数据
            //function RoadHBillNo(sqlWhere) {
            //    where = sqlWhere;
            //    var ajaxLoad = layer.load();
            //    $.ajax({
            //        type: "get",
            //        url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
            //        async: true,
            //        data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
            //        success: function (result) {
            //            if (result.count == 1) {
            //            ajaxReturage /nData = JSON.parse(JSON.stringify(result)).data;
            //            table.reload('mainTable', {
            //                data: ajaxReturnData
            //                , height: 'full-10'
            //                , page: {
            //                    curr: _cur_p/必须从第 1 é¡µå¼€å§‹
            //                }
            //                , loading: false
            //                , done: function (index, res) {

            //                }
            //            });
            //                layer.close(ajaxLoad);
            //        } else {
            //                layer.close(ajaxLoad);
            //                layer.alert(result.code + result.Message, { icon: 5 });
            //        }

            //        },
            //        error: function (result) {
            //            layer.close(ajaxLoad);
            //        layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    });
            //};
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var sqlWhere = " and 1=1 ";
                //if ($("#HStatus").val() != "")
                //    sqlWhere += " and çŠ¶æ€ like ^^%" + $("#HStatus").val() + "%^^";
@@ -306,34 +388,19 @@
                var HDate2 = $("#HDate2").val();//结束日期

                if (HBillNo)
                    sqlWhere += " and å•æ®å· like '%" + HBillNo+ "%'";
                    sqlWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                if (HNumber)
                    sqlWhere += " and ç‰©æ–™ä»£ç  like '%" + HNumber + "%'";
                if (HName)
                    sqlWhere += " and ç‰©æ–™åç§° like '%" + HName + "%'";
                if (HModel)
                    sqlWhere += " and è§„格型号 like '%" + HModel + "%'";
                //if ($("#HClStatus").val() != "")
                //    sqlWhere += " and å…³é—­çŠ¶æ€ like ^^%" + $("#HClStatus").val() + "%^^";
                //if ($("#HPURCHASEORGID").val() != "")
                //    sqlWhere += " and é‡‡è´­ç»„织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
                if (HDate1) {
                    sqlWhere += " and æ—¥æœŸ >= '" + HDate1 + "'";
                }
                if (HDate2) {
                    sqlWhere += " and æ—¥æœŸ <= '" + HDate2 + "'";
                }
                //if ($("#HISGenerate").val() != "") {
                //    if ($("#HISGenerate").val() == "是")
                //    {
                //        sqlWhere += " and æœªå…³è”数量 <= 0";
                //    }
                //    else if ($("#HISGenerate").val() == "否") {
                //        sqlWhere += " and æœªå…³è”数量 > 0";
                //    }
                //}


                var Time = $("#Time").val();
                var dd = new Date();
                var dt;
@@ -367,7 +434,85 @@
                //从第一页开始
                _cur_page = 1;
                RoadHBillNo(sqlWhere);
            });
                sqlWhere = "";
            }
            //#endregion

         
            //form.on('submit(f_Query)', function (data) {//查询
            //    var sqlWhere = " and 1=1 ";
            //    //if ($("#HStatus").val() != "")
            //    //    sqlWhere += " and çŠ¶æ€ like ^^%" + $("#HStatus").val() + "%^^";
            //    var HBillNo = $("#HBillNo").val();//单据号
            //    var HNumber = $("#HNumber").val();//物料代码
            //    var HName = $("#HName").val();//物料名称
            //    var HModel = $("#HModel").val();//规格型号
            //    var HDate1 = $("#HDate1").val();//开始日期
            //    var HDate2 = $("#HDate2").val();//结束日期

            //    if (HBillNo)
            //        sqlWhere += " and å•æ®å· like '%" + HBillNo+ "%'";
            //    if (HNumber)
            //        sqlWhere += " and ç‰©æ–™ä»£ç  like '%" + HNumber + "%'";
            //    if (HName)
            //        sqlWhere += " and ç‰©æ–™åç§° like '%" + HName + "%'";
            //    if (HModel)
            //        sqlWhere += " and è§„格型号 like '%" + HModel + "%'";
            //    //if ($("#HClStatus").val() != "")
            //    //    sqlWhere += " and å…³é—­çŠ¶æ€ like ^^%" + $("#HClStatus").val() + "%^^";
            //    //if ($("#HPURCHASEORGID").val() != "")
            //    //    sqlWhere += " and é‡‡è´­ç»„织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
            //    if (HDate1) {
            //        sqlWhere += " and æ—¥æœŸ >= '" + HDate1 + "'";
            //    }
            //    if (HDate2) {
            //        sqlWhere += " and æ—¥æœŸ <= '" + HDate2 + "'";
            //    }
            //    //if ($("#HISGenerate").val() != "") {
            //    //    if ($("#HISGenerate").val() == "是")
            //    //    {
            //    //        sqlWhere += " and æœªå…³è”数量 <= 0";
            //    //    }
            //    //    else if ($("#HISGenerate").val() == "否") {
            //    //        sqlWhere += " and æœªå…³è”数量 > 0";
            //    //    }
            //    //}


            //    var Time = $("#Time").val();
            //    var dd = new Date();
            //    var dt;
            //    switch (Time) {
            //        case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
            //        case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
            //        case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
            //        case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
            //        case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
            //        case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
            //        case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
            //        default: dd = new Date(dd.setDate(dd.getDate()));
            //    }
            //    dt = dd.getFullYear().toString();
            //    if (dd.getMonth() + 1 < 10) {
            //        dt = dt + "-0" + (dd.getMonth() + 1).toString();
            //    }
            //    else {
            //        dt = dt + "-0" + (dd.getMonth() + 1).toString();
            //    }
            //    if (dd.getDate() < 10) {
            //        dt = dt + "-0" + dd.getDate().toString();
            //    }
            //    else {
            //        dt = dt + "-" + dd.getDate().toString();
            //    }
            //    //if (Time != 8) {
            //    //    sqlWhere += " and äº¤è´§æ—¥æœŸ <= ^^" + dt + "^^";
            //    //}
            //    sql = sqlWhere;
            //    //从第一页开始
            //    _cur_page = 1;
            //    RoadHBillNo(sqlWhere);
            //});
            var $ = layui.$, active = {
                f_Query: function () { //查询

@@ -393,6 +538,15 @@
                //    });
                //}
            };
            //退出按钮
            form.on('submit(get_Exit)', function () {
                if (OperationType == 1) {
                    Pub_Close(2);
                }
                else if (OperationType == 2) {
                    Pub_Close(1);
                }
            })
            $('.test-table-reload-btn .layui-btn').on('click', function () {
                var type = $(this).data('type');
                active[type] ? active[type].call(this) : '';

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -120,7 +120,7 @@
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工作中心</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <input type="hidden" name="HCenterID" id="HCenterID" value="0">
@@ -765,18 +765,18 @@
            });
            //选择工作中心弹窗
            form.on('submit(HWorkingProcedure-BT)', function () {//选择工作中心
                //layer.open({
                //    type: 2
                //    , area: ['80%', '80%']
                //    , title: '工作中心'
                //    , shade: 0.6 //遮罩透明度
                //    //, maxmin: true //允许全屏最小化
                //    , anim: 0 //0-6的动画形式，-1不开启
                //    , content: ['../../Baseset/基础资料/Gy_WorkCenterList.html', 'yes']
                //    , resize: false
                //    , cancel: function (index, layero) {
                //    }
                //})
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '工作中心'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_WorkCenterList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
                })
                layer.msg('禁止选择');
            });
            //选择操作员

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -13,6 +13,7 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -61,6 +62,12 @@
                                        </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="HWorkBillNo" id="HWorkBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">单据号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
@@ -73,9 +80,9 @@
                                        </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">
@@ -131,6 +138,40 @@
                get_FastQuery();
            });

            //生产订单回车方法
            $('#HWorkBillNo').on('keydown', function (event) {
                var HWorkBillNo = $('#HWorkBillNo').val();
                if (event.keyCode == 13) {
                    if (!HWorkBillNo) {
                        layer.msg("任务单号不能为空！")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });
            //单据号回车方法
            $('#HBillNo').on('keydown', function (event) {
                var HBillNo = $('#HBillNo').val();
                if (event.keyCode == 13) {
                    if (!HBillNo) {
                        layer.msg("单据号不能为空！")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });
            //工序流转卡回车方法
            $('#HProcExchBillNo').on('keydown', function (event) {
                var HProcExchBillNo = $('#HProcExchBillNo').val();
                if (event.keyCode == 13) {
                    if (!HProcExchBillNo) {
                        layer.msg("工序流转卡号不能为空！")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });

            //初始化表格
            function set_InitGrid() {
                option = {
@@ -183,7 +224,7 @@
            //功能按钮是否禁用方法，每次加载表格都要调用
            function btnIs() {
                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//新增按钮
                $('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//删除按钮
                //$('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//删除按钮
                $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮
                $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//反审核按钮
                $('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//预览按钮
@@ -202,7 +243,7 @@
                    case 'btn-Edit': set_ShowBill();
                        break;
                    //删除
                    case 'btn-Delete': layer.msg('删除');
                    case 'btn-Delete': btn_Delete();
                        break;
                    //审核
                    case 'btn-Audit': set_CheckBill();
@@ -304,6 +345,7 @@

            //重置过滤条件
            function set_ClearQuery() {
                $("#HWorkBillNo").val();
                $("#HBillNo").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -313,8 +355,20 @@
            //快速过滤
            function get_FastQuery() {
                var HStatus = $("select[name='HStatus']").val();//状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HWorkBillNo = $("#HWorkBillNo").val();
                var HBillNo = $("#HBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),出站时间, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),出站时间, 23) <= '" + HEndDate + "'";
                }
                if (HWorkBillNo) {
                    sWhere += " and ä»»åŠ¡å• like '%" + HWorkBillNo + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
@@ -365,10 +419,41 @@
                });
            }

            //删除单据
            function btn_Delete() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.confirm('确定删除' + data[0].单据号 + '吗？', function (index) {
                        var ajaxLoad = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
                            type: "GET",
                            data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
                                    layer.close(ajaxLoad);
                                } else {
                                    layer.close(ajaxLoad);
                                    layer.alert(result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.close(ajaxLoad);
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                        layer.close(index);
                    });
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //退出
            function get_Exit() {
                parent.layui.admin.events.closeThisTabs();
                Pub_Close(2);
            }

            //以上是layui模块

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Sc_StationOutBill_Mul.html

@@ -475,6 +475,7 @@
                        if (result.count == 1) {
                            layer.close(index);
                            layer.msg("扫码出站成功！", { icon: 6 });
                            $("#HBarCode").val("");
                            HMainEntryRow++;
                            HqtyBill++;
                            $("#HqtyBill").val(HqtyBill);
@@ -513,7 +514,7 @@
                        var ajaxLoad = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/Cj_StationInBill/del_StationInBill',
                            url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
                            type: "GET",
                            data: { "HInterID": rowData.HInterID, "HDeleteMan": sessionStorage["HUserName"] },
                            success: function (result) {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -188,10 +188,20 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"><span style="color:red;">*</span>工作中心</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"><span style="color:red;">*</span>工作中心</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
                                            </div>
                                        </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs8 layui-inline">
@@ -912,6 +922,22 @@
                    }
                })
            });
            //选择工作中心弹窗
            form.on('submit(HWorkingProcedure-BT)', function () {//选择工作中心
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '工作中心'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_WorkCenterList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
                })
                //layer.msg('禁止选择');
            });

            //选择供应商
            form.on('submit(btnSearchSup)', function () {
@@ -980,6 +1006,11 @@
            $("#HEmpName").val(obj[0].HName);
            $("#HEmpID").val(obj[0].HItemID);
        }
        //返回工作中心
        function GetWorkCenterValue(obj) {  //返回工作中心
            $("#HCenterName").val(obj[0].工作中心);
            $("#HCenterID").val(obj[0].HItemID);
        }

    </script>
</body>

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html

@@ -63,6 +63,18 @@
                                        </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="HWorkBillNo" id="HWorkBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">单据号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                        </div>
                                    </div>
                                    <div 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="工序流转卡号" id="工序流转卡号">
@@ -77,8 +89,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">首检</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>保存列宽</button>
@@ -127,6 +139,40 @@
                get_FastQuery();
            });

            //生产订单回车方法
            $('#HWorkBillNo').on('keydown', function (event) {
                var HWorkBillNo = $('#HWorkBillNo').val();
                if (event.keyCode == 13) {
                    if (!HWorkBillNo) {
                        layer.msg("任务单号不能为空！")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });
            //单据号回车方法
            $('#HBillNo').on('keydown', function (event) {
                var HBillNo = $('#HBillNo').val();
                if (event.keyCode == 13) {
                    if (!HBillNo) {
                        layer.msg("单据号不能为空！")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });
            //工序流转卡回车方法
            $('#工序流转卡号').on('keydown', function (event) {
                var HStepBillNo = $('#工序流转卡号').val();
                if (event.keyCode == 13) {
                    if (!HStepBillNo) {
                        layer.msg("工序流转卡号不能为空！")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
@@ -143,7 +189,7 @@
                    case 'btn-Audit': set_CheckBill();
                        break;
                    //反审核
                    case 'btn-DeAudit': layer.msg('反审核！');
                    case 'btn-DeAudit': set_AbandonCheck();
                        break;
                    //首检
                    case 'btn-FirstPieceCheck': set_FirstPieceCheck();
@@ -217,8 +263,8 @@
            function btnIs() {
                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//新增按钮
                //$('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//删除按钮
                $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮
                $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//反审核按钮
                //$('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮
                //$('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//反审核按钮
                $('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//预览按钮
                $('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//保存列宽按钮
                $('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//默认列宽按钮
@@ -306,9 +352,11 @@
            function get_FastQuery() {
                var HStatus = $("select[name='HStatus']").val();//状态
                var å·¥åºæµè½¬å¡å· = $("#工序流转卡号").val();
                var HWorkBillNo = $("#HWorkBillNo").val();  //任务单号
                var HBillNo = $("#HBillNo").val();  //单据号
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                if (工序流转卡号) {
                if (工序流转卡号) { 
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + å·¥åºæµè½¬å¡å· + "%'";
                }
                if (HBeginDate) {
@@ -316,6 +364,12 @@
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),进站时间, 23) <= '" + HEndDate + "'";
                }
                if (HWorkBillNo) {
                    sWhere += " and ä»»åŠ¡å• like '%" + HWorkBillNo + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HStatus) {
                    switch (HStatus) {
@@ -339,6 +393,8 @@

            //重置过滤条件
            function set_ClearQuery() {
                $("#HWorkBillNo").val();
                $("#HBillNo").val("");
                $("#工序流转卡号").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -424,7 +480,7 @@
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=' + 3790, 'yes']
                        , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3790&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
@@ -440,7 +496,7 @@

            //退出
            function get_Exit() {
                parent.layui.admin.events.closeThisTabs();
                Pub_Close(2);
            }

            //审核
@@ -456,7 +512,7 @@
                        url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 0) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_FastQuery(table, option);
                            } else {
@@ -474,6 +530,36 @@
                }
            }

            //反审核
            function set_AbandonCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    var wait = layer.load();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cj_StationInBill/set_AbandonCheck", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_FastQuery(table, option);
                            } else {
                                layer.alert(result.Message, { icon: 5 });
                            }
                            layer.close(wait);
                        }, error: function () {
                            layer.close(wait);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }
            }

            //以上是layui模块
        });

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Sc_StationInBill_Mul.html

@@ -430,6 +430,7 @@
                        if (result.count == 1) {
                            layer.close(index);
                            layer.msg("扫码进站成功！", { icon: 6 });
                            $("#HBarCode").val("");
                            HMainEntryRow++;
                            HqtyBill++;
                            $("#HqtyBill").val(HqtyBill);