|
|
9ed4c944c5
|
fix bugs
|
2023-11-29 13:36:53 +08:00 |
|
|
|
6702521f31
|
overwrite 产线平衡分析
|
2023-11-29 11:34:43 +08:00 |
|
|
|
61b4bf784b
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-29 10:17:02 +08:00 |
|
|
|
b0f10b9002
|
'1'
|
2023-11-29 10:16:58 +08:00 |
|
|
|
365aafc21a
|
merge test
|
2023-11-29 10:15:08 +08:00 |
|
|
|
de65afef11
|
登录页去掉验证
|
2023-11-29 10:12:41 +08:00 |
|
‘937886381’
|
76771489da
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-29 08:48:41 +08:00 |
|
‘937886381’
|
27faa04c7a
|
修改bug
|
2023-11-29 08:48:09 +08:00 |
|
|
|
c0daa74a84
|
update 产线平衡分析
|
2023-11-28 19:31:08 +08:00 |
|
helloDy
|
904350a4d8
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-28 18:09:16 +08:00 |
|
helloDy
|
4873f750d8
|
ui
|
2023-11-28 18:08:39 +08:00 |
|
|
|
1a7e8cfc19
|
merge test
|
2023-11-28 16:50:51 +08:00 |
|
|
|
a0790a6e19
|
11.28
|
2023-11-28 16:42:40 +08:00 |
|
|
|
a5c17d2276
|
fix conflicts
|
2023-11-28 16:14:24 +08:00 |
|
|
|
99f771a445
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-28 15:50:00 +08:00 |
|
|
|
7201c26792
|
fix bugs
|
2023-11-28 15:46:50 +08:00 |
|
‘937886381’
|
6fc4794300
|
修改bug
|
2023-11-28 10:56:48 +08:00 |
|
‘937886381’
|
79c9f1ca66
|
修改bug
|
2023-11-28 10:54:51 +08:00 |
|
|
|
57deff3875
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-28 09:06:01 +08:00 |
|
|
|
68d3b46bab
|
update process flow
|
2023-11-28 09:04:57 +08:00 |
|
|
|
e6b9d75f16
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-28 09:03:13 +08:00 |
|
helloDy
|
c76078214e
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-27 20:42:33 +08:00 |
|
helloDy
|
b527589e0f
|
ui
|
2023-11-27 20:41:45 +08:00 |
|
|
|
a18929a261
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-27 17:04:32 +08:00 |
|
|
|
669345c983
|
merge test
|
2023-11-27 16:43:15 +08:00 |
|
|
|
b86094c630
|
订单监控
|
2023-11-27 16:41:14 +08:00 |
|
|
|
2fdee9cafd
|
update
|
2023-11-27 15:39:30 +08:00 |
|
|
|
4348d66e53
|
update
|
2023-11-27 14:40:11 +08:00 |
|
|
|
76c2f50bf3
|
fix bugs
|
2023-11-27 11:31:21 +08:00 |
|
helloDy
|
a7f1087775
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-27 09:39:01 +08:00 |
|
helloDy
|
b0efd66a75
|
bug ui
|
2023-11-27 09:38:31 +08:00 |
|
|
|
d9f3434712
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-27 09:31:52 +08:00 |
|
|
|
d5507ec4c0
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-24 19:15:23 +08:00 |
|
|
|
8802c932e2
|
update 设备报警日志
|
2023-11-24 19:10:33 +08:00 |
|
helloDy
|
7f5b9d5228
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-24 19:03:48 +08:00 |
|
helloDy
|
9eea7e049a
|
部分bug
|
2023-11-24 19:01:25 +08:00 |
|
|
|
b3a117f6c6
|
merge test
|
2023-11-24 17:31:21 +08:00 |
|
|
|
8929e53724
|
ui样式
|
2023-11-24 17:29:40 +08:00 |
|
|
|
a8fa98cb91
|
update StatusAndParams
|
2023-11-24 14:56:17 +08:00 |
|
|
|
3e9540bcc9
|
更新仓库
|
2023-11-24 14:36:59 +08:00 |
|
|
|
601387184e
|
更新仓库bug
|
2023-11-24 14:32:58 +08:00 |
|
|
|
54b63a7f53
|
update drawer and edit
|
2023-11-24 10:41:11 +08:00 |
|
helloDy
|
8004c85c32
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-24 09:14:32 +08:00 |
|
helloDy
|
9041428003
|
部分bug
|
2023-11-24 09:13:56 +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 |
|
|
|
960751a264
|
merge test
|
2023-11-23 16:57:39 +08:00 |
|
|
|
978aa3a1d1
|
ui修改
|
2023-11-23 16:56:08 +08:00 |
|
|
|
8cd53915c1
|
修改仓库UI测试bug
|
2023-11-23 16:42:09 +08:00 |
|
helloDy
|
8dbc1d512d
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-23 15:10:26 +08:00 |
|
helloDy
|
8af06c6c42
|
bug
|
2023-11-23 15:09:46 +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 |
|
|
|
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 |
|
|
|
6940155e4f
|
merge test
|
2023-11-22 17:00:32 +08:00 |
|
|
|
dfc758bfae
|
订单监控图
|
2023-11-22 16:58:32 +08:00 |
|
|
|
de15716b7c
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-22 14:53:49 +08:00 |
|
|
|
c736992a34
|
'1'
|
2023-11-22 14:49:56 +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 |
|
‘937886381’
|
a22da566c3
|
解决冲突
|
2023-11-22 14:11:23 +08:00 |
|
‘937886381’
|
3c99ddc4c0
|
修改bug
|
2023-11-22 14:00:02 +08:00 |
|
|
|
ac28476024
|
update hints
|
2023-11-22 11:15:39 +08:00 |
|
|
|
b348a31b24
|
update some equipment bugs
|
2023-11-22 10:14:40 +08:00 |
|
|
|
c6d618b2b8
|
update bugs
|
2023-11-21 17:02:22 +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 |
|
|
|
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 |
|
|
|
75f59c3279
|
更新-仓库-2级bug
|
2023-11-17 15:48:17 +08:00 |
|
|
|
bb731dfcd4
|
add custom tree
|
2023-11-17 14:56:43 +08:00 |
|
|
|
bad7175f87
|
merge test
|
2023-11-17 14:07:51 +08:00 |
|
|
|
231e9227a5
|
1
|
2023-11-17 14:04:53 +08:00 |
|
|
|
d3eb9d8fbc
|
update custom-transfer
|
2023-11-17 11:25:28 +08:00 |
|
|
|
9a7521e691
|
add CustomTrasfer
|
2023-11-17 11:15:18 +08:00 |
|
helloDy
|
40e7d6b6d8
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-17 10:26:21 +08:00 |
|
helloDy
|
1d9b97f1d0
|
设备信息bug
|
2023-11-17 10:24:53 +08:00 |
|
|
|
d1cbac481d
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-17 10:14:26 +08:00 |
|
|
|
c895975703
|
update
|
2023-11-17 10:12:00 +08:00 |
|
|
|
6ef90a8eba
|
merge test
|
2023-11-17 10:00:04 +08:00 |
|
|
|
c99393dd12
|
更新仓库bug
|
2023-11-17 09:55:09 +08:00 |
|
|
|
23c1b4b3c6
|
update
|
2023-11-17 09:48:39 +08:00 |
|
|
|
88615a52a4
|
'1'
|
2023-11-17 08:46:35 +08:00 |
|
Melete
|
010e51c0f6
|
update 工艺流程
|
2023-11-16 22:18:45 +08:00 |
|
Melete
|
a6b48280aa
|
update 工艺流程
|
2023-11-16 22:00:50 +08:00 |
|
helloDy
|
c4091b7181
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-16 21:07:59 +08:00 |
|
helloDy
|
34e6a73852
|
bug
|
2023-11-16 21:07:21 +08:00 |
|
‘937886381’
|
7523f98f84
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
2023-11-16 18:54:43 +08:00 |
|
‘937886381’
|
b349432eaa
|
修改bug
|
2023-11-16 18:52:55 +08:00 |
|
|
|
42177846e8
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-16 17:25:39 +08:00 |
|
|
|
c5b5de7a78
|
update
|
2023-11-16 17:23:58 +08:00 |
|
|
|
0884159dd7
|
update login
|
2023-11-16 17:16:37 +08:00 |
|
|
|
d37c5881a5
|
2
|
2023-11-16 16:53:35 +08:00 |
|
|
|
2b0579dc70
|
merge test
|
2023-11-16 16:13:36 +08:00 |
|
|
|
6a10afd04e
|
1
|
2023-11-16 16:12:05 +08:00 |
|
helloDy
|
25d1ac8d90
|
merge
|
2023-11-16 14:07:50 +08:00 |
|
helloDy
|
3667b98da9
|
bug
|
2023-11-16 13:57:21 +08:00 |
|
|
|
bbdf0a75f0
|
update system
|
2023-11-16 13:47:18 +08:00 |
|
‘937886381’
|
3832aee028
|
解决冲突
|
2023-11-16 08:52:38 +08:00 |
|
‘937886381’
|
2fbc6ea5e7
|
修改bug
|
2023-11-16 08:50:59 +08:00 |
|
helloDy
|
4ce62c14ee
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-15 17:47:31 +08:00 |
|
helloDy
|
e5966c27a3
|
工单[
|
2023-11-15 17:46:54 +08:00 |
|
|
|
3e9f629888
|
Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test
Reviewed-on: #82
|
2023-11-15 16:03:01 +08:00 |
|
‘937886381’
|
ecabeeeea9
|
修改bug
|
2023-11-15 15:47:45 +08:00 |
|
helloDy
|
aef062b4c9
|
merge
|
2023-11-15 14:37:52 +08:00 |
|
helloDy
|
952490f0d4
|
24h,设备
|
2023-11-15 14:30:28 +08:00 |
|
|
|
0ae68aacef
|
订单
|
2023-11-15 14:22:45 +08:00 |
|
|
|
a37fa65e8f
|
bug
|
2023-11-15 14:02:16 +08:00 |
|
|
|
5d054254f7
|
merge test
|
2023-11-15 10:17:35 +08:00 |
|
|
|
76cdc34af1
|
小bug
|
2023-11-15 10:13:54 +08:00 |
|
‘937886381’
|
ecc84a1c4b
|
合并冲突
|
2023-11-15 09:10:45 +08:00 |
|
‘937886381’
|
95f7004d1c
|
修改bug
|
2023-11-15 09:08:20 +08:00 |
|
|
|
de06dfddf4
|
仓库-bug修改
|
2023-11-14 16:02:16 +08:00 |
|
|
|
67612c79df
|
merge test
|
2023-11-14 15:47:06 +08:00 |
|
|
|
26862423c1
|
首页
|
2023-11-14 10:35:10 +08:00 |
|
|
|
d2c82fa692
|
更新-仓库-库位监控
|
2023-11-14 09:42:38 +08:00 |
|
|
|
ebae332674
|
update
|
2023-11-14 09:23:08 +08:00 |
|
|
|
7f6fa0af96
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-13 16:56:07 +08:00 |
|
|
|
ba92da2d5d
|
update login mobile
|
2023-11-13 16:55:16 +08:00 |
|
|
|
06c124a149
|
update login
|
2023-11-13 16:37:04 +08:00 |
|
helloDy
|
e6158cd59b
|
merge
|
2023-11-11 20:51:01 +08:00 |
|
helloDy
|
624ed7bc27
|
设备管理
|
2023-11-11 20:49:31 +08:00 |
|
‘937886381’
|
f7846f2767
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
2023-11-10 17:03:25 +08:00 |
|
‘937886381’
|
a8adb317c0
|
质量管理
|
2023-11-10 17:02:52 +08:00 |
|
|
|
3812eb38a9
|
修改订单bug
|
2023-11-09 15:01:50 +08:00 |
|
‘937886381’
|
1962ecc6df
|
质量管理
|
2023-11-07 19:10:45 +08:00 |
|
|
|
3ada2c5d08
|
merge test
|
2023-11-07 16:01:07 +08:00 |
|
|
|
9e8276d3a7
|
merge test
|
2023-11-07 15:55:19 +08:00 |
|
helloDy
|
f9741b07c0
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-07 15:53:53 +08:00 |
|
helloDy
|
fcb1885bf7
|
基础，物料，设备
|
2023-11-07 15:53:01 +08:00 |
|
|
|
97e6a665de
|
更新仓库
|
2023-11-07 15:49:33 +08:00 |
|
|
|
6e1bf994c2
|
bug
|
2023-11-07 15:49:07 +08:00 |
|
|
|
876f7d8f3c
|
merge test
|
2023-11-06 13:42:09 +08:00 |
|
|
|
5695c3db90
|
成品发货
|
2023-11-06 13:37:52 +08:00 |
|
helloDy
|
1d38a560ec
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-06 12:55:03 +08:00 |
|
helloDy
|
0ae3c66dc3
|
基础核心
|
2023-11-06 12:54:28 +08:00 |
|
|
|
0deb38647e
|
更新仓库管理
|
2023-11-04 16:40:16 +08:00 |
|
|
|
14d426b020
|
merge test
|
2023-11-03 17:01:14 +08:00 |
|
|
|
046a5eea32
|
成品发货
|
2023-11-03 16:59:07 +08:00 |
|
helloDy
|
e5978d1700
|
merge
|
2023-11-03 11:16:30 +08:00 |
|
helloDy
|
91eb13af26
|
客商信息、人事相关
|
2023-11-03 11:15:12 +08:00 |
|
|
|
2075b42427
|
'merge'
|
2023-11-01 09:39:25 +08:00 |
|
|
|
c851188989
|
update before hand over
|
2023-11-01 09:37:47 +08:00 |
|
Melete
|
0fa310609e
|
update 设备备品备件+巡检
|
2023-10-31 22:34:10 +08:00 |
|
|
|
57a4ca96e7
|
add
|
2023-10-31 17:49:39 +08:00 |
|
|
|
af868a7cd7
|
update 设备基础配置，设备保养
|
2023-10-30 16:51:37 +08:00 |
|
‘937886381’
|
34e8178ddc
|
解决合并冲突
|
2023-10-30 10:50:21 +08:00 |
|
‘937886381’
|
6c094b2a2e
|
修改bug
|
2023-10-30 10:48:32 +08:00 |
|
|
|
4a796130d0
|
update 设备采集配置
|
2023-10-30 10:47:06 +08:00 |
|
|
|
3bf8150764
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-10-30 10:36:13 +08:00 |
|
|
|
bacf2eab0b
|
update
|
2023-10-30 10:35:09 +08:00 |
|
|
|
013c08710c
|
merge test
|
2023-10-30 10:32:51 +08:00 |
|
|
|
00fba0a83b
|
2023.10.30提测能源&班组
|
2023-10-30 10:26:54 +08:00 |
|
helloDy
|
4615e975e8
|
merge
|
2023-10-27 16:17:28 +08:00 |
|
helloDy
|
e961bf6cfa
|
物料模块
|
2023-10-27 16:16:13 +08:00 |
|
|
|
216aa6291d
|
update 设备管理-基础配置-设备分组绑定
|
2023-10-27 14:24:47 +08:00 |
|
|
|
66660bfef7
|
update
|
2023-10-26 17:01:09 +08:00 |
|
|
|
d25261b256
|
move coreEquipment
|
2023-10-26 15:14:00 +08:00 |
|
|
|
583b934511
|
delete some files
|
2023-10-26 14:07:36 +08:00 |
|
|
|
503e988f7b
|
merge again
|
2023-10-26 11:32:29 +08:00 |
|
|
|
06e8a72f80
|
merge mes-test
|
2023-10-26 11:30:07 +08:00 |
|
|
|
6c348202a1
|
update extend process
|
2023-10-26 11:28:24 +08:00 |
|
|
|
5ba186b0c6
|
update
|
2023-10-25 17:02:43 +08:00 |
|
|
|
e153d7e077
|
update 流程图
|
2023-10-24 17:07:32 +08:00 |
|
|
|
3c31e5d63a
|
done 新建工序
|
2023-10-24 15:56:15 +08:00 |
|
|
|
392c1ea09b
|
merge test
|
2023-10-24 15:21:27 +08:00 |
|
|
|
ac4565e587
|
班组&能源基础
|
2023-10-24 15:16:20 +08:00 |
|
|
|
6006ae13d9
|
update flow
|
2023-10-24 11:17:07 +08:00 |
|
‘937886381’
|
2c3bdde403
|
包装管理
|
2023-10-23 08:42:46 +08:00 |
|
|
|
106d0ed89c
|
merge server
|
2023-10-20 17:03:06 +08:00 |
|
|
|
cfbd00b560
|
update process
|
2023-10-20 17:00:49 +08:00 |
|
|
|
a787935263
|
add process flow and process node
|
2023-10-20 16:03:40 +08:00 |
|
|
|
15da20fac7
|
add 添加一个缓存方案
|
2023-10-20 14:22:46 +08:00 |
|
|
|
6b4e906e75
|
update process flow
|
2023-10-19 16:40:36 +08:00 |
|
|
|
d121e408af
|
add 工艺流程列表
|
2023-10-19 11:13:37 +08:00 |
|
|
|
f8baaa8955
|
update ui
|
2023-10-17 17:02:53 +08:00 |
|
|
|
fe7821cbd8
|
update 核心模块-厂务-设备
|
2023-10-17 15:22:17 +08:00 |
|
|
|
a7e81ad8fb
|
Merge branch 'test' into lb
|
2023-10-16 17:04:34 +08:00 |
|
|
|
32cbf9076f
|
update 更新设备类型上传
|
2023-10-16 17:03:29 +08:00 |
|
helloDy
|
2b355aaf8f
|
ui
|
2023-10-16 15:47:31 +08:00 |
|
|
|
f60a46ed1d
|
update 设备信息上传
|
2023-10-16 15:36:26 +08:00 |
|
helloDy
|
4a67e226e1
|
merge
|
2023-10-13 17:09:07 +08:00 |
|
helloDy
|
46aaa47e07
|
bug
|
2023-10-13 17:05:01 +08:00 |
|
|
|
ca0f62b2eb
|
Merge branch 'test' into lb
|
2023-10-13 17:04:18 +08:00 |
|
|
|
5534104e87
|
update equipment edit
|
2023-10-13 17:01:49 +08:00 |
|
|
|
b72fe1bfed
|
update equipment edit
|
2023-10-13 16:08:31 +08:00 |
|
helloDy
|
d682ecc91c
|
Merge branch 'test' into dy
|
2023-10-12 17:05:03 +08:00 |
|
helloDy
|
2b76ef7d23
|
bug
|
2023-10-12 17:04:03 +08:00 |
|
|
|
9ec13b35b8
|
update equipment
|
2023-10-12 17:03:07 +08:00 |
|
