Commit Graph

  • 04a5359eda 修改 ‘937886381’ 2025-01-08 16:10:46 +08:00
  • 7ae7dfad95 Merge pull request '部分bug' (#417) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-08 15:48:58 +08:00
  • e202ac542e 部分bug juzi 2025-01-08 15:47:22 +08:00
  • eb8736178a Merge pull request 'projects/mes-zjl' (#416) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-07 14:28:21 +08:00
  • 580a66549c 系统管理bug juzi 2025-01-07 14:27:13 +08:00
  • 30c45e6f74 修改系统bug juzi 2025-01-06 10:44:23 +08:00
  • e9c2917c77 Merge pull request '排班bug' (#415) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-03 14:39:30 +08:00
  • 0a9bd0c6de Merge branch 'projects/mes-test' into projects/mes-zjl juzi 2025-01-03 14:39:08 +08:00
  • 84dbd8d5b2 排班bug juzi 2025-01-03 14:37:54 +08:00
  • 00f54f3de6 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2025-01-03 09:56:35 +08:00
  • f26d7abc64 修改 ‘937886381’ 2025-01-03 09:55:08 +08:00
  • 028c14a174 Merge pull request 'projects/mes-zjl' (#414) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-03 09:06:01 +08:00
  • b14abd39b6 Merge branch 'projects/mes-test' into projects/mes-zjl juzi 2025-01-03 09:05:22 +08:00
  • dfc8110410 排班bug juzi 2025-01-03 09:04:21 +08:00
  • d5744b4f3d Merge pull request '更新' (#413) from projects/zg-zwq into projects/zg-test 朱文强 2024-12-31 09:39:06 +08:00
  • c138755a54 更新 zwq 2024-12-31 09:38:24 +08:00
  • baede9ef34 Merge pull request '更新bug' (#412) from projects/mes-zwq into projects/mes-test 朱文强 2024-12-27 15:39:23 +08:00
  • 2c44906bd6 更新bug zwq 2024-12-27 15:38:14 +08:00
  • 466c822b0f Merge pull request '生产管理bug修改' (#411) from projects/mes-zjl into projects/mes-test 朱菊兰 2024-12-27 15:05:29 +08:00
  • 031e3098b7 生产管理bug修改 juzi 2024-12-27 15:00:43 +08:00
  • d764eae48d Merge pull request '更新自贡' (#410) from projects/zg-zwq into projects/zg-test 朱文强 2024-12-26 13:58:15 +08:00
  • baffb1f6f8 更新自贡 zwq 2024-12-26 13:57:37 +08:00
  • 8ecc5db385 Merge pull request '更新' (#409) from projects/zg-zwq into projects/zg-test 朱文强 2024-12-13 12:57:24 +08:00
  • 77259329d9 更新 zwq 2024-12-13 12:56:40 +08:00
  • 43ba33062b 更新 zwq 2024-11-29 16:42:13 +08:00
  • ca390fd764 更新汝阳bug zwq 2024-11-26 16:51:07 +08:00
  • d14dae86fc Merge pull request '工单' (#408) from projects/mes-zjl into projects/mes-test 朱菊兰 2024-11-21 15:55:47 +08:00
  • 492b591fa9 工单 juzi 2024-11-21 15:55:02 +08:00
  • fc20e275f7 Merge pull request '跟新bug' (#407) from projects/mes-zwq into projects/mes-test 朱文强 2024-11-20 13:48:28 +08:00
  • 10fd959c9d 跟新bug zwq 2024-11-20 13:47:55 +08:00
  • 342e83ab41 Merge pull request '更新bug' (#406) from projects/mes-zwq into projects/mes-test 朱文强 2024-11-18 10:45:22 +08:00
  • df530abb90 更新bug zwq 2024-11-18 10:44:51 +08:00
  • 8f1e5212e3 Merge pull request 'projects/mes-zhp' (#405) from projects/mes-zhp into projects/mes-test 张昊鹏 2024-11-14 13:43:43 +08:00
  • 5dd299e549 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2024-11-14 13:43:00 +08:00
  • 511a00d0a3 修改 ‘937886381’ 2024-11-14 13:42:29 +08:00
  • d5b71c4d7d Merge pull request '修改bug' (#404) from projects/mes-zhp into projects/mes-test 朱菊兰 2024-11-14 08:50:39 +08:00
  • 43d0a2668d 修改bug ‘937886381’ 2024-11-14 08:45:45 +08:00
  • a492fe4c87 Merge pull request '更新' (#403) from projects/mes-zwq into projects/mes-test 朱文强 2024-11-13 14:47:51 +08:00
  • 319e0ac90d 更新 zwq 2024-11-13 14:47:19 +08:00
  • e11c71edf1 Merge pull request '更新bug' (#402) from projects/mes-zwq into projects/mes-test 朱文强 2024-11-06 08:53:57 +08:00
  • 4bf610eeb1 更新bug zwq 2024-11-06 08:53:24 +08:00
  • 8e0ac6f962 Merge pull request '更新' (#401) from projects/mes-zwq into projects/mes-test 朱文强 2024-10-17 09:28:51 +08:00
  • d41ae3bc76 更新 zwq 2024-10-17 09:27:52 +08:00
  • f4eaddf6ae Merge pull request '更新' (#400) from projects/mes-zwq into projects/mes-test 朱文强 2024-10-16 09:58:03 +08:00
  • 9699e90ab3 更新 zwq 2024-10-16 09:55:22 +08:00
  • 8ad8e3a5b4 Merge pull request '更新' (#399) from projects/zg-zwq into projects/zg-test 朱文强 2024-09-26 14:14:31 +08:00
  • 6ca512392c 更新 zwq 2024-09-26 14:13:59 +08:00
  • 9fc6f013cc Merge pull request 'projects/mes-zwq' (#398) from projects/mes-zwq into projects/mes-test 朱文强 2024-09-26 14:07:58 +08:00
  • cee303fd20 更新基础mes-能源-系统 zwq 2024-09-26 14:07:00 +08:00
  • 4b621a6699 更新首页+异常告警接口对接和仓库首页跳转问题 zwq 2024-09-23 09:24:58 +08:00
  • a73502cda7 Merge pull request '更新' (#397) from projects/zg-zwq into projects/zg-test 朱文强 2024-09-14 09:02:43 +08:00
  • e32530e459 更新 zwq 2024-09-14 09:02:07 +08:00
  • 916f99a852 Merge pull request 'projects/mes-zhp' (#395) from projects/mes-zhp into projects/mes-test juzi 2024-09-11 14:28:11 +08:00
  • 9581d91c52 生产 ‘937886381’ 2024-09-11 14:26:39 +08:00
  • 64e1c1869d Merge pull request '更新' (#396) from projects/zg-zwq into projects/zg-test 朱文强 2024-09-11 13:59:37 +08:00
  • 93ac1c4742 更新 zwq 2024-09-11 13:58:14 +08:00
  • c847ba1595 生产管理 ‘937886381’ 2024-09-11 10:36:47 +08:00
  • a650f0ad9d Merge pull request '更新' (#394) from projects/zg-zwq into projects/zg-test 朱文强 2024-09-10 15:21:22 +08:00
  • e237737830 更新 zwq 2024-09-10 15:19:44 +08:00
  • 2ab8a99ff5 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2024-09-05 11:18:44 +08:00
  • d65dcb8712 修改 ‘937886381’ 2024-09-05 11:18:03 +08:00
  • 5711468b10 Merge pull request '更新仓库bug托盘编码显示' (#393) from projects/mes-zwq into projects/mes-test 朱文强 2024-08-21 13:21:26 +08:00
  • 1b82ff5a96 更新仓库bug托盘编码显示 zwq 2024-08-21 13:20:58 +08:00
  • 59f33a2ef5 Merge pull request '更新仓库、物料、班组' (#392) from projects/mes-zwq into projects/mes-test 朱文强 2024-08-21 11:43:44 +08:00
  • 3c620f4dfa 更新仓库、物料、班组 zwq 2024-08-21 11:42:23 +08:00
  • 2213b93f0a Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2024-08-13 08:36:54 +08:00
  • d6acfa4fd7 新增 ‘937886381’ 2024-08-13 08:36:23 +08:00
  • ca08b46f77 Merge pull request 'projects/mes-zjl' (#391) from projects/mes-zjl into projects/mes-test juzi 2024-08-12 18:42:02 +08:00
  • 54b3652c0e mt juzi 2024-08-12 18:39:01 +08:00
  • 884fad3b0e 用户管理&角色管理 juzi 2024-08-12 16:59:52 +08:00
  • 7eb4fdb790 Merge pull request '更新物料、仓库、班组' (#389) from projects/mes-zwq into projects/mes-test 朱文强 2024-08-12 14:04:43 +08:00
  • 48c678d260 更新物料、仓库、班组 zwq 2024-08-12 14:03:47 +08:00
  • 22ca86e0fa Merge pull request 'projects/mes-zjl' (#388) from projects/mes-zjl into projects/mes-test juzi 2024-08-05 15:36:00 +08:00
  • 38145f08ac 首页+侧边栏 juzi 2024-08-05 15:34:57 +08:00
  • ad0acc0f22 1 juzi 2024-08-02 16:35:22 +08:00
  • ad7ef729d0 暂存导航栏调整 juzi 2024-08-02 16:05:37 +08:00
  • b4b0446747 Merge pull request 'projects/mes-zhp' (#387) from projects/mes-zhp into projects/mes-test juzi 2024-08-01 16:37:22 +08:00
  • 0029af4ffa 设备 ‘937886381’ 2024-08-01 16:33:56 +08:00
  • 69aaacb1c7 暂存主页+报警 juzi 2024-08-01 15:59:13 +08:00
  • dbe784cec6 设备 ‘937886381’ 2024-07-30 08:36:49 +08:00
  • e8d566e121 Merge pull request 'projects/mes-zjl' (#386) from projects/mes-zjl into projects/mes-test juzi 2024-07-29 16:54:44 +08:00
  • c3d6b87151 1 juzi 2024-07-29 16:53:54 +08:00
  • d925556ed6 mt juzi 2024-07-29 16:36:02 +08:00
  • ec6c7120ea 1 juzi 2024-07-29 16:17:07 +08:00
  • 39571053f5 Merge pull request 'projects/mes-dy' (#385) from projects/mes-dy into projects/mes-test juzi 2024-07-29 16:03:54 +08:00
  • 7ca1f07f56 merge helloDy 2024-07-29 15:04:54 +08:00
  • 21988ae8b0 重构改动-复制文件 helloDy 2024-07-29 14:53:08 +08:00
  • e4c6154eb6 Merge pull request 'projects/mes-zjl' (#384) from projects/mes-zjl into projects/mes-test juzi 2024-07-26 15:06:26 +08:00
  • f4e847aa46 Merge branch 'projects/mes-test' into projects/mes-zjl juzi 2024-07-26 15:05:26 +08:00
  • d44c366a19 质量管理 juzi 2024-07-26 14:40:53 +08:00
  • c2defa2da6 7.24 juzi 2024-07-24 15:42:37 +08:00
  • 6aabe6dd90 质量管理 juzi 2024-07-22 16:49:10 +08:00
  • 2a801bf834 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2024-07-22 09:11:37 +08:00
  • a6fe9e654e 设备保养 ‘937886381’ 2024-07-22 09:11:01 +08:00
  • 3e51a00e17 Merge pull request 'projects/mes-zjl' (#383) from projects/mes-zjl into projects/mes-test juzi 2024-07-19 15:30:28 +08:00
  • 506f12d405 确认窗体 juzi 2024-07-19 15:29:52 +08:00
  • 587985e3c6 质量管理 juzi 2024-07-19 10:44:17 +08:00
  • 7e6cfb6345 Merge pull request 'projects/mes-zjl' (#382) from projects/mes-zjl into projects/mes-test juzi 2024-07-18 13:27:10 +08:00
  • b3623d29c5 tableH mix juzi 2024-07-18 13:25:49 +08:00
  • f043a6a0a2 7.18 juzi 2024-07-18 11:17:04 +08:00