Commit Graph

654 Commits

Author SHA1 Message Date
13bf1e0fd0 Merge pull request 'projects/mes-zhp' (#418) from projects/mes-zhp into projects/mes-test
Reviewed-on: #418
2025-01-08 16:21:21 +08:00
‘937886381’
97acb4faac Merge branch 'projects/mes-test' into projects/mes-zhp 2025-01-08 16:11:12 +08:00
‘937886381’
04a5359eda 修改 2025-01-08 16:10:46 +08:00
7ae7dfad95 Merge pull request '部分bug' (#417) from projects/mes-zjl into projects/mes-test
Reviewed-on: #417
2025-01-08 15:48:58 +08:00
e202ac542e 部分bug 2025-01-08 15:47:22 +08:00
eb8736178a Merge pull request 'projects/mes-zjl' (#416) from projects/mes-zjl into projects/mes-test
Reviewed-on: #416
2025-01-07 14:28:21 +08:00
580a66549c 系统管理bug 2025-01-07 14:27:13 +08:00
30c45e6f74 修改系统bug 2025-01-06 10:44:23 +08:00
e9c2917c77 Merge pull request '排班bug' (#415) from projects/mes-zjl into projects/mes-test
Reviewed-on: #415
2025-01-03 14:39:30 +08:00
0a9bd0c6de Merge branch 'projects/mes-test' into projects/mes-zjl 2025-01-03 14:39:08 +08:00
84dbd8d5b2 排班bug 2025-01-03 14:37:54 +08:00
‘937886381’
00f54f3de6 Merge branch 'projects/mes-test' into projects/mes-zhp 2025-01-03 09:56:35 +08:00
‘937886381’
f26d7abc64 修改 2025-01-03 09:55:08 +08:00
028c14a174 Merge pull request 'projects/mes-zjl' (#414) from projects/mes-zjl into projects/mes-test
Reviewed-on: #414
2025-01-03 09:06:01 +08:00
b14abd39b6 Merge branch 'projects/mes-test' into projects/mes-zjl 2025-01-03 09:05:22 +08:00
dfc8110410 排班bug 2025-01-03 09:04:21 +08:00
baede9ef34 Merge pull request '更新bug' (#412) from projects/mes-zwq into projects/mes-test
Reviewed-on: #412
2024-12-27 15:39:23 +08:00
zwq
2c44906bd6 更新bug 2024-12-27 15:38:14 +08:00
466c822b0f Merge pull request '生产管理bug修改' (#411) from projects/mes-zjl into projects/mes-test
Reviewed-on: #411
2024-12-27 15:05:29 +08:00
031e3098b7 生产管理bug修改 2024-12-27 15:00:43 +08:00
d14dae86fc Merge pull request '工单' (#408) from projects/mes-zjl into projects/mes-test
Reviewed-on: #408
2024-11-21 15:55:47 +08:00
492b591fa9 工单 2024-11-21 15:55:02 +08:00
fc20e275f7 Merge pull request '跟新bug' (#407) from projects/mes-zwq into projects/mes-test
Reviewed-on: #407
2024-11-20 13:48:28 +08:00
zwq
10fd959c9d 跟新bug 2024-11-20 13:47:55 +08:00
342e83ab41 Merge pull request '更新bug' (#406) from projects/mes-zwq into projects/mes-test
Reviewed-on: #406
2024-11-18 10:45:22 +08:00
zwq
df530abb90 更新bug 2024-11-18 10:44:51 +08:00
8f1e5212e3 Merge pull request 'projects/mes-zhp' (#405) from projects/mes-zhp into projects/mes-test
Reviewed-on: #405
2024-11-14 13:43:43 +08:00
‘937886381’
5dd299e549 Merge branch 'projects/mes-test' into projects/mes-zhp 2024-11-14 13:43:00 +08:00
‘937886381’
511a00d0a3 修改 2024-11-14 13:42:29 +08:00
d5b71c4d7d Merge pull request '修改bug' (#404) from projects/mes-zhp into projects/mes-test
Reviewed-on: #404
2024-11-14 08:50:39 +08:00
‘937886381’
43d0a2668d 修改bug 2024-11-14 08:45:45 +08:00
a492fe4c87 Merge pull request '更新' (#403) from projects/mes-zwq into projects/mes-test
Reviewed-on: #403
2024-11-13 14:47:51 +08:00
zwq
319e0ac90d 更新 2024-11-13 14:47:19 +08:00
e11c71edf1 Merge pull request '更新bug' (#402) from projects/mes-zwq into projects/mes-test
Reviewed-on: #402
2024-11-06 08:53:57 +08:00
zwq
4bf610eeb1 更新bug 2024-11-06 08:53:24 +08:00
8e0ac6f962 Merge pull request '更新' (#401) from projects/mes-zwq into projects/mes-test
Reviewed-on: #401
2024-10-17 09:28:51 +08:00
zwq
d41ae3bc76 更新 2024-10-17 09:27:52 +08:00
f4eaddf6ae Merge pull request '更新' (#400) from projects/mes-zwq into projects/mes-test
Reviewed-on: #400
2024-10-16 09:58:03 +08:00
zwq
9699e90ab3 更新 2024-10-16 09:55:22 +08:00
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