Commit Graph

586 Commits

Author SHA1 Message Date
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
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
87bca23d96 Merge pull request '更新物料、班组、仓库' (#380) from projects/mes-zwq into projects/mes-test
Reviewed-on: #380
2024-07-16 09:32:49 +08:00
zwq
9b20252e27 更新物料、班组、仓库 2024-07-16 09:30:33 +08:00
c9fe2ba296 Merge branch 'projects/mes' into projects/mes-zjl 2024-07-15 15:15:31 +08:00
helloDy
5e4df4d849 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-30 15:06:20 +08:00
helloDy
1d3372ed69 ui 2023-11-30 15:04:17 +08:00
86f246eb94 Merge pull request 'projects/mes-lb' (#134) from projects/mes-lb into projects/mes-test
Reviewed-on: #134
2023-11-30 14:24:09 +08:00
lb
e2a16332be Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-30 14:22:56 +08:00
lb
69b6942f35 fix bugs 2023-11-30 14:19:13 +08:00
e28cd67e20 Merge pull request 'projects/mes-test' (#133) from projects/mes-test into projects/mes
Reviewed-on: #133
2023-11-30 09:11:32 +08:00
eb063779b4 Merge pull request 'projects/mes-dy' (#129) from projects/mes-dy into projects/mes-test
Reviewed-on: #129
2023-11-30 08:58:32 +08:00
helloDy
a2672c1742 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-30 08:57:43 +08:00
4e97989ede Merge pull request 'projects/mes-zhp' (#131) from projects/mes-zhp into projects/mes-test
Reviewed-on: #131
2023-11-30 08:54:28 +08:00
‘937886381’
67200710c9 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-30 08:52:23 +08:00
7e2b75aaa5 Merge pull request 'projects/mes-zjl' (#130) from projects/mes-zjl into projects/mes-test
Reviewed-on: #130
2023-11-29 17:00:45 +08:00
8ad9b9d717 merge test 2023-11-29 17:00:00 +08:00
3bf2757e42 班组跳转 2023-11-29 16:58:08 +08:00
helloDy
2267444b4a Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-29 16:54:30 +08:00
helloDy
fa5a303c08 bug ui 2023-11-29 16:53:51 +08:00
‘937886381’
37586a31c5 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-29 15:06:55 +08:00
‘937886381’
40b023cd8d 修改bug 2023-11-29 15:06:27 +08:00
5dce57e4bb Merge pull request 'projects/mes-lb' (#127) from projects/mes-lb into projects/mes-test
Reviewed-on: #127
2023-11-29 13:41:28 +08:00
lb
50a75dcb74 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-29 13:37:51 +08:00
lb
9ed4c944c5 fix bugs 2023-11-29 13:36:53 +08:00
lb
6702521f31 overwrite 产线平衡分析 2023-11-29 11:34:43 +08:00
f37bba6747 Merge pull request 'projects/mes-zjl' (#126) from projects/mes-zjl into projects/mes-test
Reviewed-on: #126
2023-11-29 10:15:59 +08:00
365aafc21a merge test 2023-11-29 10:15:08 +08:00
de65afef11 登录页去掉验证 2023-11-29 10:12:41 +08:00
a135877df1 Merge pull request 'projects/mes-zhp' (#125) from projects/mes-zhp into projects/mes-test
Reviewed-on: #125
2023-11-29 09:06:51 +08:00
‘937886381’
8d26a9e487 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-29 08:49:05 +08:00