wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
joke.wang
|
058bd05b4a
|
mgn-bj esop展示组件优化
|
5 years ago |
joke.wang
|
ae1bb43764
|
mgn-bj edi删除多余项
|
5 years ago |
陈思洁
|
0be2231995
|
【12238 19073-安灯报表-通知记录-工作中心查询条件失效】
|
5 years ago |
陈思洁
|
6fcf32aa80
|
【2890 10 2.3.8安灯作业优化】
|
5 years ago |
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
陈思洁
|
82a769cae1
|
【12040 19073-安灯BI界面中事件物料时长,解决时长为-3290,解决在横坐标的下方有问题-20201026】
2887 10 2.3.7安灯通知优化
|
5 years ago |
songss
|
9c1965ea6c
|
11653 19073 安灯导入模板调整
|
5 years ago |
陈思洁
|
a3100a71e5
|
【9666 19073-安灯报表:工位统计报表-删除班次、设备。添加故障时长-20200721】
|
5 years ago |
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
汪云昊
|
56bd07dbf3
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
陈思洁
|
604c1443ca
|
【三色灯控制信息基础页面增删改查】
|
5 years ago |
钮海涛
|
543058b3a5
|
合并sweb代码
|
5 years ago |
陈思洁
|
b8e34a34b5
|
【11561 19081-安灯pushPLC控制三色灯-目前未控制具体工位-20200924】
|
5 years ago |
钮海涛
|
5c104e036f
|
合并test代码
|
5 years ago |
陈思洁
|
a9b18733ec
|
【11218 19081-安灯系统增加PLC交互控制三色灯-20200910】
|
5 years ago |
汪云昊
|
163d0773a9
|
修改pom文件版本
|
5 years ago |
钮海涛
|
485c66aaf7
|
合并test代码
|
5 years ago |
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
钮海涛
|
d47607880e
|
合并冲突
|
5 years ago |
宋军超
|
b0aba21859
|
中航导入问题修复
|
5 years ago |
宋军超
|
b7542f8db0
|
修改中航问题
|
5 years ago |
joke.wang
|
bd8cc364c1
|
jsp计算优化
|
5 years ago |
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
joke.wang
|
562ba3e339
|
增加按灯停机时长接口
|
5 years ago |
汪云昊
|
bda160ccec
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
王杰
|
772229b983
|
andon
|
5 years ago |
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
5 years ago |
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
钮海涛
|
3c22c8e3f4
|
test版本合并到master
|
5 years ago |
王杰
|
03dbb18bb8
|
8832 PO-HJMGN-19073--TJX5没有设备信息,但是显示了新松线的设备信息。--20200609
|
5 years ago |
王杰
|
b3999ad481
|
dev merge test
|
5 years ago |
王杰
|
767c1bffbc
|
test merge dev
|
5 years ago |
钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
钮海涛
|
9a516f893f
|
合并dev代码到test
|
5 years ago |
钮海涛
|
6033695b99
|
修复合并版本问题
|
5 years ago |
王杰
|
08cce22dbb
|
dev merge test
|
5 years ago |
王杰
|
0e3614eb68
|
test merge dev
|
5 years ago |
wynne1005
|
15f0a37508
|
还原pom
|
5 years ago |
王杰
|
9b56c6d9bf
|
【任务2223】
|
5 years ago |
wynne1005
|
bcb4e5ad13
|
merge test
|
5 years ago |
wynne1005
|
31b5f3e234
|
merge dev 还原pom
|
5 years ago |