mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 2213b93f0a Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2024-08-13 08:36:54 +0800
  • d6acfa4fd7 新增 ‘937886381’ 2024-08-13 08:36:23 +0800
  • ca08b46f77 Merge pull request 'projects/mes-zjl' (#391) from projects/mes-zjl into projects/mes-test juzi 2024-08-12 18:42:02 +0800
  • 54b3652c0e mt juzi 2024-08-12 18:39:01 +0800
  • 884fad3b0e 用户管理&角色管理 juzi 2024-08-12 16:59:52 +0800
  • 7eb4fdb790 Merge pull request '更新物料、仓库、班组' (#389) from projects/mes-zwq into projects/mes-test 朱文强 2024-08-12 14:04:43 +0800
  • 48c678d260 更新物料、仓库、班组 zwq 2024-08-12 14:03:47 +0800
  • 22ca86e0fa Merge pull request 'projects/mes-zjl' (#388) from projects/mes-zjl into projects/mes-test juzi 2024-08-05 15:36:00 +0800
  • 38145f08ac 首页+侧边栏 juzi 2024-08-05 15:34:57 +0800
  • ad0acc0f22 1 juzi 2024-08-02 16:35:22 +0800
  • ad7ef729d0 暂存导航栏调整 juzi 2024-08-02 16:05:37 +0800
  • b4b0446747 Merge pull request 'projects/mes-zhp' (#387) from projects/mes-zhp into projects/mes-test juzi 2024-08-01 16:37:22 +0800
  • 0029af4ffa 设备 ‘937886381’ 2024-08-01 16:33:56 +0800
  • 69aaacb1c7 暂存主页+报警 juzi 2024-08-01 15:59:13 +0800
  • dbe784cec6 设备 ‘937886381’ 2024-07-30 08:36:49 +0800
  • e8d566e121 Merge pull request 'projects/mes-zjl' (#386) from projects/mes-zjl into projects/mes-test juzi 2024-07-29 16:54:44 +0800
  • c3d6b87151 1 juzi 2024-07-29 16:53:54 +0800
  • d925556ed6 mt juzi 2024-07-29 16:36:02 +0800
  • ec6c7120ea 1 juzi 2024-07-29 16:17:07 +0800
  • 39571053f5 Merge pull request 'projects/mes-dy' (#385) from projects/mes-dy into projects/mes-test juzi 2024-07-29 16:03:54 +0800
  • 7ca1f07f56 merge helloDy 2024-07-29 15:04:54 +0800
  • 21988ae8b0 重构改动-复制文件 helloDy 2024-07-29 14:53:08 +0800
  • e4c6154eb6 Merge pull request 'projects/mes-zjl' (#384) from projects/mes-zjl into projects/mes-test juzi 2024-07-26 15:06:26 +0800
  • f4e847aa46 Merge branch 'projects/mes-test' into projects/mes-zjl juzi 2024-07-26 15:05:26 +0800
  • d44c366a19 质量管理 juzi 2024-07-26 14:40:53 +0800
  • c2defa2da6 7.24 juzi 2024-07-24 15:42:37 +0800
  • 6aabe6dd90 质量管理 juzi 2024-07-22 16:49:10 +0800
  • 2a801bf834 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2024-07-22 09:11:37 +0800
  • a6fe9e654e 设备保养 ‘937886381’ 2024-07-22 09:11:01 +0800
  • 3e51a00e17 Merge pull request 'projects/mes-zjl' (#383) from projects/mes-zjl into projects/mes-test juzi 2024-07-19 15:30:28 +0800
  • 506f12d405 确认窗体 juzi 2024-07-19 15:29:52 +0800
  • 587985e3c6 质量管理 juzi 2024-07-19 10:44:17 +0800
  • 7e6cfb6345 Merge pull request 'projects/mes-zjl' (#382) from projects/mes-zjl into projects/mes-test juzi 2024-07-18 13:27:10 +0800
  • b3623d29c5 tableH mix juzi 2024-07-18 13:25:49 +0800
  • f043a6a0a2 7.18 juzi 2024-07-18 11:17:04 +0800
  • 0f70fe85c8 质量管理 juzi 2024-07-17 13:49:41 +0800
  • 5a00db7dcd Merge pull request 'projects/mes-zjl' (#381) from projects/mes-zjl into projects/mes-test juzi 2024-07-16 10:07:03 +0800
  • 9bcb4d42fa 能源2-1 juzi 2024-07-16 10:05:39 +0800
  • 87bca23d96 Merge pull request '更新物料、班组、仓库' (#380) from projects/mes-zwq into projects/mes-test 朱文强 2024-07-16 09:32:49 +0800
  • 9b20252e27 更新物料、班组、仓库 zwq 2024-07-16 09:30:33 +0800
  • c9fe2ba296 Merge branch 'projects/mes' into projects/mes-zjl juzi 2024-07-15 15:15:31 +0800
  • ab56bc354a 周转标签打印50% projects/mesxc-zjl juzi 2024-05-07 09:01:32 +0800
  • 1c7c10205e Merge pull request 'projects/mesxc-dy' (#379) from projects/mesxc-dy into projects/mesxc-test projects/mesxc-test hellody 2024-04-29 17:00:48 +0800
  • 74003e9d89 Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-04-29 16:58:15 +0800
  • cb72e2b68a bug helloDy 2024-04-29 16:57:45 +0800
  • 025b061ec2 Merge pull request 'projects/mesxc-dy' (#378) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-29 09:04:59 +0800
  • f2912eaee1 merge helloDy 2024-04-28 17:10:28 +0800
  • 8025d00709 原片时间，bug helloDy 2024-04-28 17:04:22 +0800
  • 60edd8f2c4 Merge pull request 'projects/mesxc-zjl' (#377) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-27 10:46:40 +0800
  • c0214c9eb7 24包装 juzi 2024-04-27 10:45:20 +0800
  • da85e5211a Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-26 16:44:55 +0800
  • 23afb0db0d 质量样式 juzi 2024-04-26 16:44:01 +0800
  • d0adf3a63e Merge pull request '报表确认, bug' (#376) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-26 16:40:31 +0800
  • b81c95f796 报表确认, bug helloDy 2024-04-26 16:14:47 +0800
  • e7f21456a3 Merge pull request 'projects/mesxc-zhp' (#375) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-26 13:59:41 +0800
  • 1537b1be58 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp projects/mesxc-zhp ‘937886381’ 2024-04-26 10:51:48 +0800
  • b2304941a4 修改bug ‘937886381’ 2024-04-26 10:51:24 +0800
  • 14b2a49053 Merge pull request 'projects/mesxc-dy' (#374) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-26 10:39:55 +0800
  • 6adac714f0 time helloDy 2024-04-26 10:36:29 +0800
  • 0349f3cde0 Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-04-26 10:16:38 +0800
  • 4cafa78908 原片追溯，报表日期 helloDy 2024-04-26 10:16:07 +0800
  • 61ef172534 Merge pull request 'projects/mesxc-zhp' (#373) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-26 10:15:45 +0800
  • 19d913a49e Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-26 09:58:48 +0800
  • 70c3fd44d6 修改bug ‘937886381’ 2024-04-26 09:58:14 +0800
  • 78d6f0bb23 Merge pull request 'projects/mesxc-zhp' (#372) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-26 09:54:08 +0800
  • cf51eff0b7 修改bug ‘937886381’ 2024-04-26 09:52:37 +0800
  • 539dddf217 修改bug ‘937886381’ 2024-04-26 09:51:31 +0800
  • 317d01934b Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-26 09:28:46 +0800
  • cdfe5c9c1b 修改bug ‘937886381’ 2024-04-26 09:28:24 +0800
  • c1ea5157a5 Merge pull request 'projects/mesxc-zjl' (#371) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-26 08:56:39 +0800
  • 41ceefc20e Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-26 08:51:25 +0800
  • 54425859b5 报表 juzi 2024-04-26 08:50:32 +0800
  • a2a4f8dccd Merge pull request 'projects/mesxc-zhp' (#370) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-26 08:49:53 +0800
  • fd3b054108 修改bug ‘937886381’ 2024-04-26 08:42:24 +0800
  • dacae0cbd8 修改bug ‘937886381’ 2024-04-26 08:32:32 +0800
  • be83c8196e 修改bug ‘937886381’ 2024-04-25 18:50:58 +0800
  • ef3f5d3fe7 修改bug ‘937886381’ 2024-04-25 17:14:16 +0800
  • ec550f22ec 修改bug ‘937886381’ 2024-04-25 17:08:59 +0800
  • 60633ac581 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-25 17:03:24 +0800
  • 9351b82d11 修改bug ‘937886381’ 2024-04-25 17:02:52 +0800
  • 5e4227ba25 Merge pull request 'projects/mesxc-zjl' (#369) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-25 14:50:30 +0800
  • 82f63dc4ff Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-25 14:49:08 +0800
  • 9a29185410 1 juzi 2024-04-25 14:46:32 +0800
  • 43e824f958 Merge pull request 'projects/mesxc-dy' (#368) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-25 14:45:40 +0800
  • de831b339f Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-04-25 14:44:05 +0800
  • f0105c377c bug and 原片 helloDy 2024-04-25 14:43:29 +0800
  • 3ba5574669 Merge pull request 'projects/mesxc-zhp' (#367) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-25 14:21:29 +0800
  • 082988d6d7 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-25 13:57:11 +0800
  • 7acb861919 修改bug ‘937886381’ 2024-04-25 13:56:49 +0800
  • c41153a946 Merge pull request 'projects/mesxc-zjl' (#366) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-25 11:09:31 +0800
  • 6d658d9212 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-25 11:08:15 +0800
  • bf4bab2f3c 烟气隐藏 juzi 2024-04-25 11:06:16 +0800
  • 20f0efa413 Merge pull request 'projects/mesxc-zhp' (#365) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-25 10:58:01 +0800
  • c48f81b1d9 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-25 10:19:25 +0800
  • 7233720c2e 修改bug ‘937886381’ 2024-04-25 10:19:02 +0800
  • 6a491ff498 Merge pull request 'projects/mesxc-zhp' (#364) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-25 10:08:47 +0800
  • be607e4bf3 解决冲突 ‘937886381’ 2024-04-25 10:07:19 +0800
  • 87ef42e277 修改bug ‘937886381’ 2024-04-25 10:05:41 +0800
  • aa65a7e97e Merge pull request 'projects/mesxc-dy' (#363) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-25 10:01:22 +0800
  • b8d26c87d8 月报年报 helloDy 2024-04-25 09:57:13 +0800