 高天泽
|
eb063779b4
|
Merge pull request 'projects/mes-dy' (#129) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/129
|
9 个月前 |
 helloDy
|
a2672c1742
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
9 个月前 |
|
高天泽
|
4e97989ede
|
Merge pull request 'projects/mes-zhp' (#131) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/131
|
9 个月前 |
 ‘937886381’
|
67200710c9
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
9 个月前 |
 juzi
|
7e2b75aaa5
|
Merge pull request 'projects/mes-zjl' (#130) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/130
|
9 个月前 |
|
juzi
|
8ad9b9d717
|
merge test
|
9 个月前 |
|
juzi
|
3bf2757e42
|
班组跳转
|
9 个月前 |
|
helloDy
|
2267444b4a
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
9 个月前 |
|
helloDy
|
fa5a303c08
|
bug ui
|
9 个月前 |
|
‘937886381’
|
37586a31c5
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
9 个月前 |
|
‘937886381’
|
40b023cd8d
|
修改bug
|
9 个月前 |
 g7hoo
|
5dce57e4bb
|
Merge pull request 'projects/mes-lb' (#127) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/127
|
9 个月前 |
|
lb
|
50a75dcb74
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
9 个月前 |
|
lb
|
9ed4c944c5
|
fix bugs
|
9 个月前 |
|
lb
|
6702521f31
|
overwrite 产线平衡分析
|
9 个月前 |
|
juzi
|
f37bba6747
|
Merge pull request 'projects/mes-zjl' (#126) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/126
|
9 个月前 |
|
juzi
|
365aafc21a
|
merge test
|
9 个月前 |
|
juzi
|
de65afef11
|
登录页去掉验证
|
9 个月前 |
|
高天泽
|
a135877df1
|
Merge pull request 'projects/mes-zhp' (#125) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/125
|
9 个月前 |
|
‘937886381’
|
8d26a9e487
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
9 个月前 |
|
‘937886381’
|
76771489da
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
9 个月前 |
|
‘937886381’
|
27faa04c7a
|
修改bug
|
9 个月前 |
|
lb
|
c0daa74a84
|
update 产线平衡分析
|
9 个月前 |
|
高天泽
|
6e7339bca3
|
Merge pull request 'projects/mes-dy' (#124) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/124
|
9 个月前 |
|
helloDy
|
904350a4d8
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
9 个月前 |
|
helloDy
|
4873f750d8
|
ui
|
9 个月前 |
|
juzi
|
13b522475e
|
Merge pull request 'projects/mes-zjl' (#123) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/123
|
9 个月前 |
|
juzi
|
1a7e8cfc19
|
merge test
|
9 个月前 |
|
juzi
|
a0790a6e19
|
11.28
|
9 个月前 |
|
g7hoo
|
b76b8f4fe9
|
Merge pull request 'projects/mes-lb' (#122) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/122
|
9 个月前 |
|
lb
|
978291e68a
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
9 个月前 |
|
lb
|
a5c17d2276
|
fix conflicts
|
9 个月前 |
|
g7hoo
|
a7b4e72bc2
|
Merge pull request 'projects/mes-lb' (#121) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/121
|
9 个月前 |
|
lb
|
99f771a445
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
9 个月前 |
|
lb
|
7201c26792
|
fix bugs
|
9 个月前 |
|
高天泽
|
ad56aaf359
|
Merge pull request 'projects/mes-zhp' (#120) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/120
|
9 个月前 |
|
‘937886381’
|
5033bbb206
|
解决冲突
|
9 个月前 |
|
‘937886381’
|
6fc4794300
|
修改bug
|
9 个月前 |
|
‘937886381’
|
79c9f1ca66
|
修改bug
|
9 个月前 |
|
g7hoo
|
c74269b282
|
Merge pull request 'projects/mes-lb' (#119) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/119
|
9 个月前 |
|
lb
|
57deff3875
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
9 个月前 |
|
lb
|
68d3b46bab
|
update process flow
|
9 个月前 |
|
高天泽
|
4323982b89
|
Merge pull request 'projects/mes-dy' (#118) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/118
|
9 个月前 |
|
helloDy
|
c76078214e
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
9 个月前 |
|
helloDy
|
b527589e0f
|
ui
|
9 个月前 |
|
g7hoo
|
375273419d
|
Merge pull request 'projects/mes-lb' (#117) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/117
|
9 个月前 |
|
lb
|
a18929a261
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
9 个月前 |
|
juzi
|
6d465c17c2
|
Merge pull request 'projects/mes-zjl' (#116) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/116
|
9 个月前 |
|
juzi
|
669345c983
|
merge test
|
9 个月前 |
|
juzi
|
b86094c630
|
订单监控
|
9 个月前 |
|
lb
|
2fdee9cafd
|
update
|
9 个月前 |
|
lb
|
4348d66e53
|
update
|
9 个月前 |
|
lb
|
76c2f50bf3
|
fix bugs
|
9 个月前 |
|
高天泽
|
888b5aa91f
|
Merge pull request 'projects/mes-dy' (#115) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/115
|
9 个月前 |
|
helloDy
|
a7f1087775
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
9 个月前 |
|
helloDy
|
b0efd66a75
|
bug ui
|
9 个月前 |
|
g7hoo
|
51f72ea5d2
|
Merge pull request 'projects/mes-lb' (#114) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/114
|
9 个月前 |
|
lb
|
d5507ec4c0
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
lb
|
8802c932e2
|
update 设备报警日志
|
10 个月前 |
|
高天泽
|
ee26741e62
|
Merge pull request 'projects/mes-dy' (#113) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/113
|
10 个月前 |
|
helloDy
|
7f5b9d5228
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
10 个月前 |
|
helloDy
|
9eea7e049a
|
部分bug
|
10 个月前 |
|
juzi
|
328b3ff560
|
Merge pull request 'projects/mes-zjl' (#112) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/112
|
10 个月前 |
|
juzi
|
b3a117f6c6
|
merge test
|
10 个月前 |
|
juzi
|
8929e53724
|
ui样式
|
10 个月前 |
|
lb
|
a8fa98cb91
|
update StatusAndParams
|
10 个月前 |
 朱文强
|
db081c1bd1
|
Merge pull request '更新仓库' (#111) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/111
|
10 个月前 |
|
朱文强
|
3e9540bcc9
|
更新仓库
|
10 个月前 |
|
朱文强
|
69ceadab69
|
Merge pull request '更新仓库bug' (#110) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/110
|
10 个月前 |
|
朱文强
|
601387184e
|
更新仓库bug
|
10 个月前 |
|
lb
|
54b63a7f53
|
update drawer and edit
|
10 个月前 |
|
高天泽
|
b625ef0118
|
Merge pull request 'projects/mes-dy' (#109) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/109
|
10 个月前 |
|
helloDy
|
8004c85c32
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
10 个月前 |
|
helloDy
|
9041428003
|
部分bug
|
10 个月前 |
|
g7hoo
|
39d06cd902
|
Merge pull request 'projects/mes-lb' (#108) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/108
|
10 个月前 |
|
lb
|
d79ba71bd7
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
lb
|
0225be1c94
|
fix bugs
|
10 个月前 |
|
juzi
|
265024d989
|
Merge pull request 'projects/mes-zjl' (#107) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/107
|
10 个月前 |
|
juzi
|
960751a264
|
merge test
|
10 个月前 |
|
juzi
|
978aa3a1d1
|
ui修改
|
10 个月前 |
|
朱文强
|
2eb1afe9b2
|
Merge pull request '修改仓库UI测试bug' (#106) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/106
|
10 个月前 |
|
朱文强
|
8cd53915c1
|
修改仓库UI测试bug
|
10 个月前 |
|
朱文强
|
571d204d68
|
Merge pull request 'projects/mes-zhp' (#105) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/105
|
10 个月前 |
|
helloDy
|
8dbc1d512d
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
10 个月前 |
|
helloDy
|
8af06c6c42
|
bug
|
10 个月前 |
|
‘937886381’
|
afafbccc0c
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
10 个月前 |
|
‘937886381’
|
0948737f1a
|
修改bug
|
10 个月前 |
|
g7hoo
|
0ce6bc07a0
|
Merge pull request 'projects/mes-lb' (#104) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/104
|
10 个月前 |
|
lb
|
e318aa4f59
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
lb
|
ab09a2b08c
|
update zentao bugs
|
10 个月前 |
|
juzi
|
d2d5503792
|
Merge pull request 'projects/mes-zjl' (#103) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/103
|
10 个月前 |
|
juzi
|
6940155e4f
|
merge test
|
10 个月前 |
|
juzi
|
dfc758bfae
|
订单监控图
|
10 个月前 |
|
高天泽
|
ec2994e928
|
Merge pull request 'projects/mes-dy' (#102) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/102
|
10 个月前 |
|
helloDy
|
5492666b53
|
merge
|
10 个月前 |
|
lb
|
cd55b4c860
|
update
|
10 个月前 |
|
helloDy
|
a7f811aa3e
|
bug
|
10 个月前 |
|
lb
|
33188481bf
|
update login
|
10 个月前 |
|
高天泽
|
0200fc08f1
|
Merge pull request 'projects/mes-zhp' (#101) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/101
|
10 个月前 |
|
‘937886381’
|
a22da566c3
|
解决冲突
|
10 个月前 |
|
‘937886381’
|
3c99ddc4c0
|
修改bug
|
10 个月前 |
|
g7hoo
|
96705bd4d9
|
Merge pull request 'update hints' (#100) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/100
|
10 个月前 |
|
lb
|
ac28476024
|
update hints
|
10 个月前 |
|
g7hoo
|
1299a56e22
|
Merge pull request 'update some equipment bugs' (#99) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/99
|
10 个月前 |
|
lb
|
b348a31b24
|
update some equipment bugs
|
10 个月前 |
|
g7hoo
|
67d639c413
|
Merge pull request 'update bugs' (#98) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/98
|
10 个月前 |
|
lb
|
c6d618b2b8
|
update bugs
|
10 个月前 |
|
g7hoo
|
aa79d15f52
|
Merge pull request 'projects/mes-lb' (#97) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/97
|
10 个月前 |
|
lb
|
c8fb8d7589
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
lb
|
51baca61cc
|
update equipment attach process
|
10 个月前 |
|
lb
|
847e34fcc6
|
update
|
10 个月前 |
|
lb
|
32a43fbc3b
|
update process equipment relation
|
10 个月前 |
|
lb
|
20975948ef
|
update
|
10 个月前 |
|
朱文强
|
c46c4dbf65
|
Merge pull request '更新仓库bug' (#96) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/96
|
10 个月前 |
|
朱文强
|
685a3308db
|
更新仓库bug
|
10 个月前 |
|
lb
|
ac041c2f4a
|
update bom-selector v1
|
10 个月前 |
|
lb
|
dd23c49ba0
|
update 设备选择
|
10 个月前 |
|
lb
|
44452f2e89
|
update
|
10 个月前 |
|
lb
|
8ddef0de9d
|
update bomselector
|
10 个月前 |
|
lb
|
7249abf5b1
|
add BomSelector
|
10 个月前 |
|
lb
|
76f5385140
|
add Candidate
|
10 个月前 |
|
朱文强
|
27f4e034be
|
Merge pull request '更新-仓库-2级bug' (#95) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/95
|
10 个月前 |
|
朱文强
|
75f59c3279
|
更新-仓库-2级bug
|
10 个月前 |
|
lb
|
bb731dfcd4
|
add custom tree
|
10 个月前 |
|
juzi
|
8c37647aab
|
Merge pull request 'projects/mes-zjl' (#94) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/94
|
10 个月前 |
|
juzi
|
bad7175f87
|
merge test
|
10 个月前 |
|
juzi
|
231e9227a5
|
1
|
10 个月前 |
|
lb
|
d3eb9d8fbc
|
update custom-transfer
|
10 个月前 |
|
lb
|
9a7521e691
|
add CustomTrasfer
|
10 个月前 |
|
高天泽
|
e82ee4e542
|
Merge pull request 'projects/mes-dy' (#93) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/93
|
10 个月前 |
|
helloDy
|
40e7d6b6d8
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
10 个月前 |
|
helloDy
|
1d9b97f1d0
|
设备信息bug
|
10 个月前 |
|
g7hoo
|
cfaa17ee28
|
Merge pull request 'projects/mes-lb' (#92) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/92
|
10 个月前 |
|
lb
|
d1cbac481d
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
lb
|
c895975703
|
update
|
10 个月前 |
|
lb
|
6ef90a8eba
|
merge test
|
10 个月前 |
|
朱文强
|
e63b98161f
|
Merge pull request '更新仓库bug' (#91) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/91
|
10 个月前 |
|
朱文强
|
c99393dd12
|
更新仓库bug
|
10 个月前 |
|
lb
|
23c1b4b3c6
|
update
|
10 个月前 |
 gtz
|
88615a52a4
|
'1'
|
10 个月前 |
|
gtz
|
bc3959412d
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
10 个月前 |
 Melete
|
010e51c0f6
|
update 工艺流程
|
10 个月前 |
|
Melete
|
a6b48280aa
|
update 工艺流程
|
10 个月前 |
|
高天泽
|
9f11fa3e00
|
Merge pull request 'projects/mes-dy' (#90) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/90
|
10 个月前 |
|
helloDy
|
c4091b7181
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
10 个月前 |
|
helloDy
|
34e6a73852
|
bug
|
10 个月前 |
|
高天泽
|
79a6a4804a
|
Merge pull request 'projects/mes-zhp' (#89) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/89
|
10 个月前 |
|
‘937886381’
|
7523f98f84
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
10 个月前 |
|
‘937886381’
|
b349432eaa
|
修改bug
|
10 个月前 |
|
g7hoo
|
4393c0e0e8
|
Merge pull request 'projects/mes-lb' (#88) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/88
|
10 个月前 |
|
lb
|
42177846e8
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
lb
|
c5b5de7a78
|
update
|
10 个月前 |
|
lb
|
0884159dd7
|
update login
|
10 个月前 |
|
gtz
|
87eccc7b25
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
10 个月前 |
|
juzi
|
8a819b84b6
|
Merge pull request 'projects/mes-zjl' (#87) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/87
|
10 个月前 |
|
juzi
|
d37c5881a5
|
2
|
10 个月前 |
|
juzi
|
2b0579dc70
|
merge test
|
10 个月前 |
|
juzi
|
6a10afd04e
|
1
|
10 个月前 |
|
gtz
|
7c1c61f8f8
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
10 个月前 |
 hellody
|
fb967fb825
|
Merge pull request 'projects/mes-dy' (#86) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/86
|
10 个月前 |
|
helloDy
|
25d1ac8d90
|
merge
|
10 个月前 |
|
helloDy
|
3667b98da9
|
bug
|
10 个月前 |
|
g7hoo
|
d3c289f11e
|
Merge pull request 'projects/mes-lb' (#85) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/85
|
10 个月前 |
|
lb
|
bbdf0a75f0
|
update system
|
10 个月前 |
|
gtz
|
5339854df4
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
10 个月前 |
|
lb
|
26658accfc
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
高天泽
|
31033dd7e2
|
Merge pull request 'projects/mes-zhp' (#84) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/84
|
10 个月前 |
|
‘937886381’
|
3832aee028
|
解决冲突
|
10 个月前 |
|
‘937886381’
|
2fbc6ea5e7
|
修改bug
|
10 个月前 |
|
高天泽
|
d0cb4d383e
|
Merge pull request 'projects/mes-dy' (#83) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/83
|
10 个月前 |
|
helloDy
|
4ce62c14ee
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
10 个月前 |
|
helloDy
|
e5966c27a3
|
工单[
|
10 个月前 |
|
gtz
|
ea1d981a5a
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
10 个月前 |
|
高天泽
|
3e9f629888
|
Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/82
|
10 个月前 |
|
‘937886381’
|
ecabeeeea9
|
修改bug
|
10 个月前 |
|
gtz
|
0f7a8fbf73
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
10 个月前 |
|
gtz
|
d7366e80ee
|
'1'
|
10 个月前 |
|
高天泽
|
3da077bdf3
|
Merge pull request 'projects/mes-dy' (#81) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/81
|
10 个月前 |
|
helloDy
|
aef062b4c9
|
merge
|
10 个月前 |
|
helloDy
|
952490f0d4
|
24h,设备
|
10 个月前 |
|
juzi
|
51d6ce5dbb
|
Merge pull request '订单' (#80) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/80
|
10 个月前 |
|
juzi
|
0ae68aacef
|
订单
|
10 个月前 |
|
juzi
|
2ab686a797
|
Merge pull request 'bug' (#79) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/79
|
10 个月前 |
|
juzi
|
a37fa65e8f
|
bug
|
10 个月前 |
|
juzi
|
887390cf91
|
Merge pull request 'projects/mes-zjl' (#78) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/78
|
10 个月前 |
|
juzi
|
5d054254f7
|
merge test
|
10 个月前 |
|
juzi
|
76cdc34af1
|
小bug
|
10 个月前 |
|
高天泽
|
0fefe4d432
|
Merge pull request 'projects/mes-zhp' (#77) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/77
|
10 个月前 |
|
‘937886381’
|
ecc84a1c4b
|
合并冲突
|
10 个月前 |
|
‘937886381’
|
95f7004d1c
|
修改bug
|
10 个月前 |
|
朱文强
|
9a1aa047b0
|
Merge pull request '仓库-bug修改' (#76) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/76
|
10 个月前 |
|
朱文强
|
de06dfddf4
|
仓库-bug修改
|
10 个月前 |
|
juzi
|
26100af90a
|
Merge pull request 'projects/mes-zjl' (#75) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/75
|
10 个月前 |
|
juzi
|
67612c79df
|
merge test
|
10 个月前 |
|
juzi
|
26862423c1
|
首页
|
10 个月前 |
|
朱文强
|
a1a7256af5
|
Merge pull request '更新-仓库-库位监控' (#74) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/74
|
10 个月前 |
|
朱文强
|
d2c82fa692
|
更新-仓库-库位监控
|
10 个月前 |
|
g7hoo
|
5654b3aeef
|
Merge pull request 'update' (#73) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/73
|
10 个月前 |
|
lb
|
ebae332674
|
update
|
10 个月前 |
|
g7hoo
|
afae859d8b
|
更新login Merge pull request 'projects/mes-lb' (#71) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/71
|
10 个月前 |
|
lb
|
7f6fa0af96
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
lb
|
ba92da2d5d
|
update login mobile
|
10 个月前 |
|
lb
|
06c124a149
|
update login
|
10 个月前 |
|
高天泽
|
e369fe25ca
|
Merge pull request 'projects/mes-dy' (#70) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/70
|
10 个月前 |
|
helloDy
|
e6158cd59b
|
merge
|
10 个月前 |
|
helloDy
|
624ed7bc27
|
设备管理
|
10 个月前 |
|
高天泽
|
afba54fcab
|
Merge pull request 'projects/mes-zhp' (#69) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/69
|
10 个月前 |
|
‘937886381’
|
f7846f2767
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
10 个月前 |
|
‘937886381’
|
a8adb317c0
|
质量管理
|
10 个月前 |
|
juzi
|
b185d3ebf7
|
Merge pull request 'projects/mes-zjl' (#68) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/68
|
10 个月前 |
|
juzi
|
045843bc1c
|
mrege test
|
10 个月前 |
|
juzi
|
3812eb38a9
|
修改订单bug
|
10 个月前 |
|
‘937886381’
|
1962ecc6df
|
质量管理
|
10 个月前 |
|
juzi
|
e64e33a203
|
Merge pull request 'projects/mes-zjl' (#67) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/67
|
10 个月前 |
|
juzi
|
3ada2c5d08
|
merge test
|
10 个月前 |
|
高天泽
|
0eb6a99fa9
|
Merge pull request 'projects/mes-dy' (#66) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/66
|
10 个月前 |
|
juzi
|
9e8276d3a7
|
merge test
|
10 个月前 |
|
helloDy
|
f9741b07c0
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
10 个月前 |
|
helloDy
|
fcb1885bf7
|
基础，物料，设备
|
10 个月前 |
|
朱文强
|
123d45afa9
|
Merge pull request '更新仓库' (#65) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/65
|
10 个月前 |
|
朱文强
|
97e6a665de
|
更新仓库
|
10 个月前 |
|
juzi
|
6e1bf994c2
|
bug
|
10 个月前 |
|
juzi
|
298789bf24
|
Merge pull request 'projects/mes-zjl' (#64) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/64
|
10 个月前 |
|
juzi
|
876f7d8f3c
|
merge test
|
10 个月前 |
|
juzi
|
5695c3db90
|
成品发货
|
10 个月前 |
|
高天泽
|
9537c55f0e
|
Merge pull request 'projects/mes-dy' (#63) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/63
|
10 个月前 |
|
helloDy
|
1d38a560ec
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
10 个月前 |
|
helloDy
|
0ae3c66dc3
|
基础核心
|
10 个月前 |
|
朱文强
|
e49084d85d
|
Merge pull request '更新仓库管理' (#62) from projects/mes-zwq into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/62
|
10 个月前 |
|
朱文强
|
0deb38647e
|
更新仓库管理
|
10 个月前 |
|
juzi
|
5521f07c18
|
Merge pull request 'projects/mes-zjl' (#61) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/61
|
10 个月前 |
|
juzi
|
14d426b020
|
merge test
|
10 个月前 |
|
juzi
|
046a5eea32
|
成品发货
|
10 个月前 |
|
高天泽
|
b468204f88
|
Merge pull request 'projects/mes-dy' (#60) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/60
|
10 个月前 |
|
helloDy
|
e5978d1700
|
merge
|
10 个月前 |
|
helloDy
|
91eb13af26
|
客商信息、人事相关
|
10 个月前 |
|
g7hoo
|
fe29043ab1
|
Merge pull request 'projects/mes-lb' (#59) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/59
|
10 个月前 |
|
lb
|
2075b42427
|
'merge'
|
10 个月前 |
|
lb
|
c851188989
|
update before hand over
|
10 个月前 |
|
Melete
|
0fa310609e
|
update 设备备品备件+巡检
|
10 个月前 |
|
lb
|
57a4ca96e7
|
add
|
10 个月前 |
|
lb
|
af868a7cd7
|
update 设备基础配置，设备保养
|
10 个月前 |
|
高天泽
|
cb1ad9edec
|
Merge pull request 'projects/mes-zhp' (#57) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/57
|
10 个月前 |
|
‘937886381’
|
34e8178ddc
|
解决合并冲突
|
10 个月前 |
|
‘937886381’
|
6c094b2a2e
|
修改bug
|
10 个月前 |
|
lb
|
4a796130d0
|
update 设备采集配置
|
10 个月前 |
|
g7hoo
|
60f65e6f85
|
Merge pull request 'projects/mes-lb' (#56) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/56
|
10 个月前 |
|
lb
|
3bf8150764
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
10 个月前 |
|
lb
|
bacf2eab0b
|
update
|
10 个月前 |
|
juzi
|
8155a78649
|
Merge pull request 'projects/mes-zjl' (#55) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/55
|
10 个月前 |
|
juzi
|
013c08710c
|
merge test
|
10 个月前 |
|
juzi
|
00fba0a83b
|
2023.10.30提测能源&班组
|
10 个月前 |
|
高天泽
|
c71613f3fc
|
Merge pull request 'projects/mes-dy' (#54) from projects/mes-dy into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/54
|
10 个月前 |
|
helloDy
|
4615e975e8
|
merge
|
10 个月前 |
|
helloDy
|
e961bf6cfa
|
物料模块
|
10 个月前 |
|
lb
|
216aa6291d
|
update 设备管理-基础配置-设备分组绑定
|
10 个月前 |
|
lb
|
66660bfef7
|
update
|
10 个月前 |
|
lb
|
d25261b256
|
move coreEquipment
|
10 个月前 |
|
lb
|
583b934511
|
delete some files
|
10 个月前 |
|
g7hoo
|
55e023d0a8
|
Merge pull request 'projects/mes-lb' (#53) from projects/mes-lb into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/53
|
10 个月前 |
|
lb
|
503e988f7b
|
merge again
|
10 个月前 |
|
lb
|
06e8a72f80
|
merge mes-test
|
10 个月前 |
|
lb
|
6c348202a1
|
update extend process
|
10 个月前 |
|
lb
|
5ba186b0c6
|
update
|
11 个月前 |
|
lb
|
e153d7e077
|
update 流程图
|
11 个月前 |
|
lb
|
3c31e5d63a
|
done 新建工序
|
11 个月前 |
|
juzi
|
619cf9e1ce
|
Merge pull request 'projects/mes-zjl' (#52) from projects/mes-zjl into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/52
|
11 个月前 |
|
juzi
|
392c1ea09b
|
merge test
|
11 个月前 |
|
juzi
|
ac4565e587
|
班组&能源基础
|
11 个月前 |
|
lb
|
6006ae13d9
|
update flow
|
11 个月前 |
|
高天泽
|
74d5646d65
|
Merge pull request '包装管理' (#51) from projects/mes-zhp into projects/mes-test
Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/51
|
11 个月前 |
|
‘937886381’
|
2c3bdde403
|
包装管理
|
11 个月前 |
|
lb
|
106d0ed89c
|
merge server
|
11 个月前 |
|
lb
|
cfbd00b560
|
update process
|
11 个月前 |
|
lb
|
a787935263
|
add process flow and process node
|
11 个月前 |
|
lb
|
15da20fac7
|
add 添加一个缓存方案
|
11 个月前 |
|
lb
|
6b4e906e75
|
update process flow
|
11 个月前 |
|
lb
|
d121e408af
|
add 工艺流程列表
|
11 个月前 |
|
lb
|
f8baaa8955
|
update ui
|
11 个月前 |
|
lb
|
416d4bb390
|
update
|
11 个月前 |
|
lb
|
fe7821cbd8
|
update 核心模块-厂务-设备
|
11 个月前 |
