宋军超
|
8d2f6fb8d1
|
任务：【1842】-海纳川基础数据修改字段类型
|
5 years ago |
joke.wang
|
88a0d6d02f
|
任务:[1828] 半成品绑定工步增加逻辑
|
5 years ago |
陈思洁
|
8ab6e77620
|
【8528 收货检验-图片上传未开发】
|
5 years ago |
|
宋军超
|
1f55c06368
|
任务：【1842】-海纳川通用导入添加对应工具类、实体和model
|
5 years ago |
|
陈思洁
|
7eb72ee5d1
|
【调试接口回传和同步】
|
5 years ago |
|
宋军超
|
9778561725
|
任务：【1842】-添加海纳川基础数据维护模块
|
5 years ago |
|
陈思洁
|
a1c0b6ff26
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
1ea5b54052
|
【生成质检单增加是否让步字段】
|
5 years ago |
|
joke.wang
|
b741b6950b
|
bug: [8516] 重新计算bug 1
|
5 years ago |
 王杰
|
786c442d55
|
解决冲突
|
5 years ago |
|
宋军超
|
18e037da7f
|
任务：【1842】-添加海纳川基础数据的Repository
|
5 years ago |
|
宋军超
|
af6b0ce0fd
|
任务：【1842】-添加海纳川5个基础数据模块的实体与枚举
|
5 years ago |
|
joke.wang
|
0352980cde
|
bug: [8516] 重新计算bug修复
|
5 years ago |
 钮海涛
|
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 |
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 |
|
贾文涛
|
e63601716f
|
1736-MES数据权限模块开发
|
5 years ago |
|
宋军超
|
e5e41f09e7
|
新增散件产品配置功能
|
5 years ago |
|
陈思洁
|
ae156ad82f
|
【动态按钮--完成按钮修改mes和mespcn】
|
5 years ago |
|
joke.wang
|
3227cfa47e
|
[oee]
|
5 years ago |
|
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
5 years ago |
|
陈思洁
|
32f6215be7
|
【8309 产品配方导入-导入报错】
|
5 years ago |
|
王杰
|
da1c10dc4c
|
mes生产计划批量编制
|
5 years ago |
 曾贞一
|
cf12f354ae
|
[8206 生产工单-导入失败]
|
5 years ago |
|
joke.wang
|
de7d007ef1
|
[获取工步sql server分组函数问题修复]
|
5 years ago |
|
陈思洁
|
ad8255949a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
be925fded9
|
【1693-设备状态监控看板】
|
5 years ago |
|
joke.wang
|
60428b5bad
|
[任务：1690 界面窗口]
|
5 years ago |
|
陈思洁
|
22b42d710b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
ff6e5ac926
|
【8239 生产作业-单产品扫描（数据写入有误）】
|
5 years ago |
|
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |