nies
|
e7d4015f10
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
924339025e
|
Merge pull request '北京pda显示新增分组' (#328) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/328
|
3 years ago |
jun
|
14678a5bad
|
北京pda显示新增分组
|
3 years ago |
castle.zang
|
9aafab3d5a
|
增加中航新的mes-history的menuRootCode
|
3 years ago |
|
castle.zang
|
8fc894b413
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
|
castle.zang
|
db2941fd31
|
调试bsp方法管理，执行器管理，日志管理接口
|
3 years ago |
|
nies
|
a2efd76c7d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
261fd456d5
|
Merge pull request '中航物料对象修复' (#327) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/327
|
3 years ago |
 王宝玉
|
c92b401fe4
|
中航物料对象修复
|
3 years ago |
|
nies
|
d58b6715be
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
c9535bf555
|
新增产品类型EAM 设备信息管理服务
|
3 years ago |
|
castle.zang
|
a0079ae73f
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
|
castle.zang
|
b81b9c569d
|
冷热数据分离--重构--测试完成
|
3 years ago |
|
nies
|
b534c07bdb
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
ba78a4b0f7
|
Merge pull request '【19625 21062+质检报表导出失败，需修复】' (#326) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/326
|
3 years ago |
 曾贞一
|
fbc5415086
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
b5fb208027
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
5c9e6ad4cf
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
cb5db7101a
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
nies
|
53a7709bc8
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
castle.zang
|
94c61f77f4
|
冷热数据分离--重构
|
3 years ago |
|
castle.zang
|
c2437fd00f
|
接口映射bean
|
3 years ago |
|
nies
|
1ec1192200
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
edc4a74001
|
Merge pull request '中航物料对象导入修改' (#323) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/323
|
3 years ago |
|
王宝玉
|
2e2487ebc0
|
中航物料对象导入修改
|
3 years ago |
|
nies
|
ab699b98b8
|
Merge branch 'test' into ext-dev
|
3 years ago |
link
|
8c65aa1294
|
fix miss field
|
3 years ago |
|
nies
|
c3b145f8dc
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
link
|
ac152cf3f2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
link
|
b04cedf70b
|
添加dao的数据接口
|
3 years ago |
|
nies
|
0c0cfa6f6a
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
a43b17841f
|
软适配新增SuitRetryModel
|
3 years ago |
|
nies
|
2418d6d655
|
修改ext-dev pojo版本为1.0.0.1
|
3 years ago |
|
nies
|
c6367b0795
|
解决screen的冲突
|
3 years ago |
|
castle.zang
|
1ad2e71b5c
|
log4j2升级版本
|
3 years ago |
|
castle.zang
|
8a369c31fa
|
通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT
|
3 years ago |
 钮海涛
|
80851b5a06
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
0cf4d5742d
|
四车间问题修复
|
4 years ago |
|
nies
|
204bbad81c
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
38b1ce6643
|
(update)更新aps-4的端口为8400
|
4 years ago |
|
nies
|
7343b4901d
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
d06fe76744
|
增加aps_3和aps_4的枚举配置
|
4 years ago |
|
nies
|
3d4a0e0bb9
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
jun
|
93d84b66f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
4 years ago |
|
jun
|
67ed074d35
|
18681 交易类型需要导出功能
|
4 years ago |
|
nies
|
7ab206edbd
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
fc9ef265f9
|
修改aps-2的menurootid
|
4 years ago |
|
nies
|
b2da2bd935
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
0400305d91
|
增加aps-2的枚举配置
|
4 years ago |
|
钮海涛
|
8de712ad1d
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |