 钮海涛
|
c1241bd6c5
|
修复版本问题
|
5 years ago |
|
钮海涛
|
53a421b3b9
|
修复版本问题
|
5 years ago |
|
钮海涛
|
94e9b2ffec
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
 王杰
|
029763feb1
|
pom
|
5 years ago |
|
王杰
|
30fcf4f23f
|
pom冲突
|
5 years ago |
|
王杰
|
716e1f7df1
|
Merge branch 'test' into dev
|
5 years ago |
陈思洁
|
9cc193c12b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
d2a31eac70
|
【1804 质检检测-来料检验功能】
|
5 years ago |
joke.wang
|
25bd05348d
|
[serialVersionUID重复问题]
|
5 years ago |
汪云昊
|
717f268c28
|
POJO版本号还原
|
5 years ago |
|
钮海涛
|
281ef662b1
|
merge test
|
5 years ago |
|
陈思洁
|
6fbfea417f
|
【1804 质检检测-来料检验功能】
|
5 years ago |
|
陈思洁
|
aef8841223
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
60973a3ee0
|
【1804 质检检测-来料检验功能】
|
5 years ago |
 贾文涛
|
c4510fb121
|
BUG #8485,修复数据权限-查询启用禁用无效
|
5 years ago |
宋军超
|
00df3134b2
|
任务：【1829】-更新检测单和检测单明细实体
|
5 years ago |
|
joke.wang
|
de9c901a3b
|
[任务：1826 库存排程配置]
|
5 years ago |
|
joke.wang
|
222ba4f8a4
|
[任务：1825 plc增加默认属性字段]
|
5 years ago |
|
王杰
|
a6e9b90026
|
pom
|
5 years ago |
|
宋军超
|
1f97be3078
|
添加检测结果报表（5个界面）
|
5 years ago |
|
宋军超
|
82af372fc0
|
添加检测过程类型枚举
|
5 years ago |
|
王杰
|
de9017ca5c
|
冲突
|
5 years ago |
|
王杰
|
c68d49880c
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
7d192b36a6
|
pom冲突
|
5 years ago |
|
joke.wang
|
1fec97f0c1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
24806b9e2e
|
[oee优化]
|
5 years ago |
|
宋军超
|
78ff224fe4
|
删除查询供应商
|
5 years ago |
|
宋军超
|
79e90298ef
|
添加供应商查询
|
5 years ago |
|
宋军超
|
98091426f2
|
修改实体
|
5 years ago |
|
宋军超
|
f302b4d5f1
|
修改MES_检验单实体字段
|
5 years ago |
|
宋军超
|
e7335bb632
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
4f5f9777a2
|
修改实体与model字段
|
5 years ago |
|
贾文涛
|
f7b3250d70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
abbab6bda4
|
数据权限-工单模块检索添加数据权限功能
|
5 years ago |
|
joke.wang
|
664bf80434
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
23d1762b5b
|
[bug: 8422 半成品标签打印bug]
|
5 years ago |
|
钮海涛
|
da8b4db890
|
修复pom版本问题
|
5 years ago |
|
宋军超
|
a1579a2484
|
添加过程检测报表model
|
5 years ago |
|
宋军超
|
6d7d8de7b3
|
添加MES_检验单和MES_检验单明细的实体和枚举
|
5 years ago |
|
宋军超
|
32de58277a
|
添加MES_检验单和MES_检验单明细的实体和枚举
|
5 years ago |
|
宋军超
|
7ef769268d
|
添加MES_检验单和检验单明细实体与枚举
|
5 years ago |
|
joke.wang
|
5fb7eecee0
|
[任务：1752 oee看板]
|
5 years ago |
|
贾文涛
|
e668ef4b28
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
eadf0d67f8
|
添加数据权限处理方法
|
5 years ago |
|
钮海涛
|
f87eeeb491
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
ac268c1cbc
|
Merge branch 'test' into dev
|
5 years ago |
|
陈思洁
|
543f0f5c4c
|
【代码合并还原】
|
5 years ago |
|
joke.wang
|
b450df5754
|
[任务：1752工厂oee]
|
5 years ago |
|
joke.wang
|
142f8e79c6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
f41cd22258
|
[bug: 8353 拍照采集]
|
5 years ago |