陈思洁
|
c0f5709bb2
|
【合并冲突】
|
6 years ago |
|
陈思洁
|
aef8841223
|
【合并冲突】
|
6 years ago |
|
陈思洁
|
60973a3ee0
|
【1804 质检检测-来料检验功能】
|
6 years ago |
 王杰
|
a6e9b90026
|
pom
|
6 years ago |
宋军超
|
1f5052d679
|
添加检测过程类型枚举
|
6 years ago |
|
宋军超
|
82af372fc0
|
添加检测过程类型枚举
|
6 years ago |
|
王杰
|
de9017ca5c
|
冲突
|
6 years ago |
|
王杰
|
c68d49880c
|
Merge branch 'dev' into test
|
6 years ago |
qianhs
|
eb7511c39e
|
bug:8268;8267;8266;8265
|
6 years ago |
puxiao.liao
|
f765493696
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
|
6 years ago |
|
puxiao.liao
|
70aeae21d3
|
8426 中航-报表中心-采购计划更改查询-查询条件无效
|
6 years ago |
 钮海涛
|
8ae8383e79
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
钮海涛
|
23b06a53af
|
bug:8404
|
6 years ago |
|
钮海涛
|
da8b4db890
|
修复pom版本问题
|
6 years ago |
|
宋军超
|
32de58277a
|
添加MES_检验单和MES_检验单明细的实体和枚举
|
6 years ago |
|
宋军超
|
7ef769268d
|
添加MES_检验单和检验单明细实体与枚举
|
6 years ago |
许心洁
|
75be7d5078
|
任务#1744：全局替换自定义搜索功能
|
6 years ago |
joke.wang
|
5fb7eecee0
|
[任务：1752 oee看板]
|
6 years ago |
|
许心洁
|
ef6330675c
|
任务#1744：全局替换自定义搜索功能
|
6 years ago |
 贾文涛
|
e668ef4b28
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
贾文涛
|
eadf0d67f8
|
添加数据权限处理方法
|
6 years ago |
|
钮海涛
|
f87eeeb491
|
修复合并版本问题
|
6 years ago |
|
钮海涛
|
ac268c1cbc
|
Merge branch 'test' into dev
|
6 years ago |
|
puxiao.liao
|
ba81a26700
|
1778 产品工装关系维护
|
6 years ago |
|
joke.wang
|
f6e2a509f0
|
[任务：1751工厂小时OEE]
|
6 years ago |
 曾贞一
|
1901cf6eb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
2dac15c248
|
【1709 BH-录入检测值】
|
6 years ago |
|
钮海涛
|
40a87d83b3
|
修复合并问题
|
6 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
6 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
6 years ago |
wynne1005
|
1cda7e902b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
宋军超
|
345b261118
|
设备添加枚举EQU_DEFECT_CAUSE故障原因,EQU_DEFECT_METHOD故障处理措施,EQU_DEFECT_PHENOMENON故障现象;
|
6 years ago |
|
wynne1005
|
27e4fb164b
|
Merge branch 'dev' into test
|
6 years ago |
|
wynne1005
|
d925ec62bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
888d87f12e
|
task edi
|
6 years ago |
|
joke.wang
|
f38a47cc68
|
[oee 定时任务]
|
6 years ago |
|
qianhs
|
fdaa4c1740
|
bug:8268;8267;8266;8265
|
6 years ago |
|
贾文涛
|
a563537750
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
贾文涛
|
e63601716f
|
1736-MES数据权限模块开发
|
6 years ago |
|
qianhs
|
f03e119561
|
bug:8268;8267;8266;8265
|
6 years ago |
|
钮海涛
|
8f884a58cf
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
钮海涛
|
90edd435e3
|
bug:8293;8297
|
6 years ago |
|
joke.wang
|
3227cfa47e
|
[oee]
|
6 years ago |
|
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
de200de372
|
mes
|
6 years ago |
|
钮海涛
|
a575b4eed4
|
bug:8287;8288;8290
|
6 years ago |
|
王杰
|
da1c10dc4c
|
mes生产计划批量编制
|
6 years ago |
|
钮海涛
|
ac9ffb1ac1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
袁津哲
|
000c2ad16c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
745455c5bd
|
修改波次规则bug和对接导入模板接口
|
6 years ago |