|
|
39d06cd902
|
Merge pull request 'projects/mes-lb' (#108) from projects/mes-lb into projects/mes-test
Reviewed-on: #108
|
2023-11-24 08:56:13 +08:00 |
|
|
|
d79ba71bd7
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-24 08:51:18 +08:00 |
|
|
|
0225be1c94
|
fix bugs
|
2023-11-23 17:07:57 +08:00 |
|
|
|
265024d989
|
Merge pull request 'projects/mes-zjl' (#107) from projects/mes-zjl into projects/mes-test
Reviewed-on: #107
|
2023-11-23 16:58:12 +08:00 |
|
|
|
960751a264
|
merge test
|
2023-11-23 16:57:39 +08:00 |
|
|
|
978aa3a1d1
|
ui修改
|
2023-11-23 16:56:08 +08:00 |
|
|
|
2eb1afe9b2
|
Merge pull request '修改仓库UI测试bug' (#106) from projects/mes-zwq into projects/mes-test
Reviewed-on: #106
|
2023-11-23 16:42:37 +08:00 |
|
|
|
8cd53915c1
|
修改仓库UI测试bug
|
2023-11-23 16:42:09 +08:00 |
|
|
|
571d204d68
|
Merge pull request 'projects/mes-zhp' (#105) from projects/mes-zhp into projects/mes-test
Reviewed-on: #105
|
2023-11-23 16:41:12 +08:00 |
|
‘937886381’
|
afafbccc0c
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
2023-11-23 14:33:32 +08:00 |
|
‘937886381’
|
0948737f1a
|
修改bug
|
2023-11-23 14:32:53 +08:00 |
|
|
|
0ce6bc07a0
|
Merge pull request 'projects/mes-lb' (#104) from projects/mes-lb into projects/mes-test
Reviewed-on: #104
|
2023-11-22 17:09:03 +08:00 |
|
|
|
e318aa4f59
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-22 17:05:53 +08:00 |
|
|
|
ab09a2b08c
|
update zentao bugs
|
2023-11-22 17:04:22 +08:00 |
|
|
|
d2d5503792
|
Merge pull request 'projects/mes-zjl' (#103) from projects/mes-zjl into projects/mes-test
Reviewed-on: #103
|
2023-11-22 17:01:21 +08:00 |
|
|
|
6940155e4f
|
merge test
|
2023-11-22 17:00:32 +08:00 |
|
|
|
dfc758bfae
|
订单监控图
|
2023-11-22 16:58:32 +08:00 |
|
|
|
ec2994e928
|
Merge pull request 'projects/mes-dy' (#102) from projects/mes-dy into projects/mes-test
Reviewed-on: #102
|
2023-11-22 14:53:35 +08:00 |
|
helloDy
|
5492666b53
|
merge
|
2023-11-22 14:43:07 +08:00 |
|
|
|
cd55b4c860
|
update
|
2023-11-22 14:41:53 +08:00 |
|
helloDy
|
a7f811aa3e
|
bug
|
2023-11-22 14:41:10 +08:00 |
|
|
|
33188481bf
|
update login
|
2023-11-22 14:27:30 +08:00 |
|
|
|
0200fc08f1
|
Merge pull request 'projects/mes-zhp' (#101) from projects/mes-zhp into projects/mes-test
Reviewed-on: #101
|
2023-11-22 14:14:03 +08:00 |
|
‘937886381’
|
a22da566c3
|
解决冲突
|
2023-11-22 14:11:23 +08:00 |
|
‘937886381’
|
3c99ddc4c0
|
修改bug
|
2023-11-22 14:00:02 +08:00 |
|
|
|
96705bd4d9
|
Merge pull request 'update hints' (#100) from projects/mes-lb into projects/mes-test
Reviewed-on: #100
|
2023-11-22 13:28:39 +08:00 |
|
|
|
ac28476024
|
update hints
|
2023-11-22 11:15:39 +08:00 |
|
|
|
1299a56e22
|
Merge pull request 'update some equipment bugs' (#99) from projects/mes-lb into projects/mes-test
Reviewed-on: #99
|
2023-11-22 10:21:55 +08:00 |
|
|
|
b348a31b24
|
update some equipment bugs
|
2023-11-22 10:14:40 +08:00 |
|
|
|
67d639c413
|
Merge pull request 'update bugs' (#98) from projects/mes-lb into projects/mes-test
Reviewed-on: #98
|
2023-11-21 17:03:52 +08:00 |
|
|
|
c6d618b2b8
|
update bugs
|
2023-11-21 17:02:22 +08:00 |
|
|
|
aa79d15f52
|
Merge pull request 'projects/mes-lb' (#97) from projects/mes-lb into projects/mes-test
Reviewed-on: #97
|
2023-11-21 16:09:15 +08:00 |
|
|
|
c8fb8d7589
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-21 16:08:44 +08:00 |
|
|
|
51baca61cc
|
update equipment attach process
|
2023-11-21 15:07:33 +08:00 |
|
|
|
847e34fcc6
|
update
|
2023-11-21 11:48:17 +08:00 |
|
|
|
32a43fbc3b
|
update process equipment relation
|
2023-11-21 09:13:28 +08:00 |
|
|
|
20975948ef
|
update
|
2023-11-20 16:50:38 +08:00 |
|
|
|
c46c4dbf65
|
Merge pull request '更新仓库bug' (#96) from projects/mes-zwq into projects/mes-test
Reviewed-on: #96
|
2023-11-20 16:11:49 +08:00 |
|
|
|
685a3308db
|
更新仓库bug
|
2023-11-20 16:09:42 +08:00 |
|
|
|
ac041c2f4a
|
update bom-selector v1
|
2023-11-20 15:53:23 +08:00 |
|
|
|
dd23c49ba0
|
update 设备选择
|
2023-11-20 14:21:14 +08:00 |
|
|
|
44452f2e89
|
update
|
2023-11-20 11:26:27 +08:00 |
|
|
|
8ddef0de9d
|
update bomselector
|
2023-11-17 17:07:52 +08:00 |
|
|
|
7249abf5b1
|
add BomSelector
|
2023-11-17 16:57:55 +08:00 |
|
|
|
76f5385140
|
add Candidate
|
2023-11-17 16:05:57 +08:00 |
|
|
|
27f4e034be
|
Merge pull request '更新-仓库-2级bug' (#95) from projects/mes-zwq into projects/mes-test
Reviewed-on: #95
|
2023-11-17 15:48:45 +08:00 |
|
|
|
75f59c3279
|
更新-仓库-2级bug
|
2023-11-17 15:48:17 +08:00 |
|
|
|
bb731dfcd4
|
add custom tree
|
2023-11-17 14:56:43 +08:00 |
|
|
|
8c37647aab
|
Merge pull request 'projects/mes-zjl' (#94) from projects/mes-zjl into projects/mes-test
Reviewed-on: #94
|
2023-11-17 14:08:54 +08:00 |
|
|
|
bad7175f87
|
merge test
|
2023-11-17 14:07:51 +08:00 |
|
