 王杰
|
de9017ca5c
|
冲突
|
5 years ago |
|
王杰
|
c68d49880c
|
Merge branch 'dev' into test
|
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 |
wynne1005
|
63bc0b5928
|
merge test
|
5 years ago |
|
wynne1005
|
46a91a13bc
|
jis 去除rule关键字
|
5 years ago |
|
wynne1005
|
25b2fb8e21
|
jis pojo 去除rule 关键字
|
5 years ago |
|
陈思洁
|
28de0251ea
|
【sonar bug修改】
|
5 years ago |
|
钮海涛
|
bbe03cc6fd
|
解决合并冲突问题
|
5 years ago |
|
钮海涛
|
1b88b20e13
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
40a87d83b3
|
修复合并问题
|
5 years ago |
|
贾文涛
|
6760ed79dd
|
数据权限-修改启用禁用问题
|
5 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
5 years ago |
|
钮海涛
|
d74d78353d
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
5 years ago |
|
王杰
|
1dff3327d7
|
任务：1733 条码模板逻辑调整
|
5 years ago |
|
joke.wang
|
363ac22ade
|
[任务：1750 OEE运算JOB]
|
5 years ago |
|
wynne1005
|
1cda7e902b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
f9dfc8e0e2
|
plc地址清单添加plc类型字段(枚举)，设备台账添加作业校验模式字段(枚举)
|
5 years ago |
|
wynne1005
|
27e4fb164b
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
724e784fe3
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
王杰
|
c5d4cd7dad
|
生产计划编制
|
5 years ago |
|
wynne1005
|
d925ec62bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
888d87f12e
|
task edi
|
5 years ago |
|
joke.wang
|
f38a47cc68
|
[oee 定时任务]
|
5 years ago |
|
贾文涛
|
a563537750
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |