|
|
3812eb38a9
|
修改订单bug
|
2023-11-09 15:01:50 +08:00 |
|
‘937886381’
|
1962ecc6df
|
质量管理
|
2023-11-07 19:10:45 +08:00 |
|
|
|
e64e33a203
|
Merge pull request 'projects/mes-zjl' (#67) from projects/mes-zjl into projects/mes-test
Reviewed-on: #67
|
2023-11-07 16:01:50 +08:00 |
|
|
|
3ada2c5d08
|
merge test
|
2023-11-07 16:01:07 +08:00 |
|
|
|
0eb6a99fa9
|
Merge pull request 'projects/mes-dy' (#66) from projects/mes-dy into projects/mes-test
Reviewed-on: #66
|
2023-11-07 15:55:56 +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 |
|
|
|
123d45afa9
|
Merge pull request '更新仓库' (#65) from projects/mes-zwq into projects/mes-test
Reviewed-on: #65
|
2023-11-07 15:49:59 +08:00 |
|
|
|
97e6a665de
|
更新仓库
|
2023-11-07 15:49:33 +08:00 |
|
|
|
6e1bf994c2
|
bug
|
2023-11-07 15:49:07 +08:00 |
|
|
|
298789bf24
|
Merge pull request 'projects/mes-zjl' (#64) from projects/mes-zjl into projects/mes-test
Reviewed-on: #64
|
2023-11-06 13:43:22 +08:00 |
|
|
|
876f7d8f3c
|
merge test
|
2023-11-06 13:42:09 +08:00 |
|
|
|
5695c3db90
|
成品发货
|
2023-11-06 13:37:52 +08:00 |
|
|
|
9537c55f0e
|
Merge pull request 'projects/mes-dy' (#63) from projects/mes-dy into projects/mes-test
Reviewed-on: #63
|
2023-11-06 12:57:09 +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 |
|
|
|
e49084d85d
|
Merge pull request '更新仓库管理' (#62) from projects/mes-zwq into projects/mes-test
Reviewed-on: #62
|
2023-11-04 16:40:59 +08:00 |
|
|
|
0deb38647e
|
更新仓库管理
|
2023-11-04 16:40:16 +08:00 |
|
|
|
5521f07c18
|
Merge pull request 'projects/mes-zjl' (#61) from projects/mes-zjl into projects/mes-test
Reviewed-on: #61
|
2023-11-03 17:02:04 +08:00 |
|
|
|
14d426b020
|
merge test
|
2023-11-03 17:01:14 +08:00 |
|
|
|
046a5eea32
|
成品发货
|
2023-11-03 16:59:07 +08:00 |
|
|
|
b468204f88
|
Merge pull request 'projects/mes-dy' (#60) from projects/mes-dy into projects/mes-test
Reviewed-on: #60
|
2023-11-03 15:38:59 +08:00 |
|
helloDy
|
e5978d1700
|
merge
|
2023-11-03 11:16:30 +08:00 |
|
helloDy
|
91eb13af26
|
客商信息、人事相关
|
2023-11-03 11:15:12 +08:00 |
|
|
|
fe29043ab1
|
Merge pull request 'projects/mes-lb' (#59) from projects/mes-lb into projects/mes-test
Reviewed-on: #59
|
2023-11-01 09:45:17 +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 |
|
|
|
cb1ad9edec
|
Merge pull request 'projects/mes-zhp' (#57) from projects/mes-zhp into projects/mes-test
Reviewed-on: #57
|
2023-10-30 11:04:40 +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 |
|
|
|
60f65e6f85
|
Merge pull request 'projects/mes-lb' (#56) from projects/mes-lb into projects/mes-test
Reviewed-on: #56
|
2023-10-30 10:37:41 +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 |
|
|
|
8155a78649
|
Merge pull request 'projects/mes-zjl' (#55) from projects/mes-zjl into projects/mes-test
Reviewed-on: #55
|
2023-10-30 10:33:43 +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 |
|
|
|
c71613f3fc
|
Merge pull request 'projects/mes-dy' (#54) from projects/mes-dy into projects/mes-test
Reviewed-on: #54
|
2023-10-27 16:19:19 +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 |
|
|
|
55e023d0a8
|
Merge pull request 'projects/mes-lb' (#53) from projects/mes-lb into projects/mes-test
Reviewed-on: #53
|
2023-10-26 11:34:28 +08:00 |
|
|
|
503e988f7b
|
merge again
|
2023-10-26 11:32:29 +08:00 |
|
