Commit Graph

615 Commits

Author SHA1 Message Date
9fc6f013cc Merge pull request 'projects/mes-zwq' (#398) from projects/mes-zwq into projects/mes-test
Reviewed-on: #398
2024-09-26 14:07:58 +08:00
zwq
cee303fd20 更新基础mes-能源-系统 2024-09-26 14:07:00 +08:00
zwq
4b621a6699 更新首页+异常告警接口对接和仓库首页跳转问题 2024-09-23 09:24:58 +08:00
916f99a852 Merge pull request 'projects/mes-zhp' (#395) from projects/mes-zhp into projects/mes-test
Reviewed-on: #395
2024-09-11 14:28:11 +08:00
‘937886381’
9581d91c52 生产 2024-09-11 14:26:39 +08:00
‘937886381’
c847ba1595 生产管理 2024-09-11 10:36:47 +08:00
‘937886381’
2ab8a99ff5 Merge branch 'projects/mes-test' into projects/mes-zhp 2024-09-05 11:18:44 +08:00
‘937886381’
d65dcb8712 修改 2024-09-05 11:18:03 +08:00
5711468b10 Merge pull request '更新仓库bug托盘编码显示' (#393) from projects/mes-zwq into projects/mes-test
Reviewed-on: #393
2024-08-21 13:21:26 +08:00
zwq
1b82ff5a96 更新仓库bug托盘编码显示 2024-08-21 13:20:58 +08:00
59f33a2ef5 Merge pull request '更新仓库、物料、班组' (#392) from projects/mes-zwq into projects/mes-test
Reviewed-on: #392
2024-08-21 11:43:44 +08:00
zwq
3c620f4dfa 更新仓库、物料、班组 2024-08-21 11:42:23 +08:00
‘937886381’
2213b93f0a Merge branch 'projects/mes-test' into projects/mes-zhp 2024-08-13 08:36:54 +08:00
‘937886381’
d6acfa4fd7 新增 2024-08-13 08:36:23 +08:00
ca08b46f77 Merge pull request 'projects/mes-zjl' (#391) from projects/mes-zjl into projects/mes-test
Reviewed-on: #391
2024-08-12 18:42:02 +08:00
54b3652c0e mt 2024-08-12 18:39:01 +08:00
884fad3b0e 用户管理&角色管理 2024-08-12 16:59:52 +08:00
7eb4fdb790 Merge pull request '更新物料、仓库、班组' (#389) from projects/mes-zwq into projects/mes-test
Reviewed-on: #389
2024-08-12 14:04:43 +08:00
zwq
48c678d260 更新物料、仓库、班组 2024-08-12 14:03:47 +08:00
22ca86e0fa Merge pull request 'projects/mes-zjl' (#388) from projects/mes-zjl into projects/mes-test
Reviewed-on: #388
2024-08-05 15:36:00 +08:00
38145f08ac 首页+侧边栏 2024-08-05 15:34:57 +08:00
ad0acc0f22 1 2024-08-02 16:35:22 +08:00
ad7ef729d0 暂存导航栏调整 2024-08-02 16:05:37 +08:00
b4b0446747 Merge pull request 'projects/mes-zhp' (#387) from projects/mes-zhp into projects/mes-test
Reviewed-on: #387
2024-08-01 16:37:22 +08:00
‘937886381’
0029af4ffa 设备 2024-08-01 16:33:56 +08:00
69aaacb1c7 暂存主页+报警 2024-08-01 15:59:13 +08:00
‘937886381’
dbe784cec6 设备 2024-07-30 08:36:49 +08:00
e8d566e121 Merge pull request 'projects/mes-zjl' (#386) from projects/mes-zjl into projects/mes-test
Reviewed-on: #386
2024-07-29 16:54:44 +08:00
c3d6b87151 1 2024-07-29 16:53:54 +08:00
d925556ed6 mt 2024-07-29 16:36:02 +08:00
ec6c7120ea 1 2024-07-29 16:17:07 +08:00
39571053f5 Merge pull request 'projects/mes-dy' (#385) from projects/mes-dy into projects/mes-test
Reviewed-on: #385
2024-07-29 16:03:54 +08:00
helloDy
7ca1f07f56 merge 2024-07-29 15:04:54 +08:00
helloDy
21988ae8b0 重构改动-复制文件 2024-07-29 14:53:08 +08:00
e4c6154eb6 Merge pull request 'projects/mes-zjl' (#384) from projects/mes-zjl into projects/mes-test
Reviewed-on: #384
2024-07-26 15:06:26 +08:00
f4e847aa46 Merge branch 'projects/mes-test' into projects/mes-zjl 2024-07-26 15:05:26 +08:00
d44c366a19 质量管理 2024-07-26 14:40:53 +08:00
c2defa2da6 7.24 2024-07-24 15:42:37 +08:00
6aabe6dd90 质量管理 2024-07-22 16:49:10 +08:00
‘937886381’
2a801bf834 Merge branch 'projects/mes-test' into projects/mes-zhp 2024-07-22 09:11:37 +08:00
‘937886381’
a6fe9e654e 设备保养 2024-07-22 09:11:01 +08:00
3e51a00e17 Merge pull request 'projects/mes-zjl' (#383) from projects/mes-zjl into projects/mes-test
Reviewed-on: #383
2024-07-19 15:30:28 +08:00
506f12d405 确认窗体 2024-07-19 15:29:52 +08:00
587985e3c6 质量管理 2024-07-19 10:44:17 +08:00
7e6cfb6345 Merge pull request 'projects/mes-zjl' (#382) from projects/mes-zjl into projects/mes-test
Reviewed-on: #382
2024-07-18 13:27:10 +08:00
b3623d29c5 tableH mix 2024-07-18 13:25:49 +08:00
f043a6a0a2 7.18 2024-07-18 11:17:04 +08:00
0f70fe85c8 质量管理 2024-07-17 13:49:41 +08:00
5a00db7dcd Merge pull request 'projects/mes-zjl' (#381) from projects/mes-zjl into projects/mes-test
Reviewed-on: #381
2024-07-16 10:07:03 +08:00
9bcb4d42fa 能源2-1 2024-07-16 10:05:39 +08:00