wynne1005
5f80cc4322
Merge branch 'dev' into test
5 years ago
陈思洁
759cb39827
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
陈思洁
260899368d
【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】
5 years ago
wynne1005
2d69c3ab18
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
wynne1005
6b9d56f9e0
自测修改
5 years ago
joke.wang
00ca9bef40
Finish Task #1960 Cost:16h
5 years ago
宋军超
56dec41ad0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
宋军超
f5074fba08
Finish Task #1898 Cost:16h
5 years ago
陈思洁
94c7526d65
【盲检工步】
5 years ago
陈思洁
4d4469ebc9
【合并冲突】
5 years ago
陈思洁
3848c6da14
【盲检工步】
5 years ago
宋军超
febbb549fc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
宋军超
612d768999
Start Task #1932 Cost:5h Left:3h
5 years ago
joke.wang
a8241a1694
Start Task #1960 Cost:8h Left:8h
5 years ago
袁津哲
399c9c828e
Fix Bug #1916,1917
5 years ago
宋军超
c2a5a17379
工步参数添加工步弹框参数字段
5 years ago
joke.wang
342e5f7ab2
Effort Task #1915 Cost:2h Left:0h
5 years ago
wynne1005
8ef3997038
还原pom
5 years ago
wynne1005
4150543cb4
Effort Task #1940 Cost:16h Left:8h
5 years ago
钮海涛
4d26c95639
Merge branch 'test' into dev
5 years ago
joke.wang
d4f0ef157a
Finish Task #1915 Cost:8h
5 years ago
宋军超
659b893903
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
宋军超
b05113f63c
Finish Task #1887 Cost:16h
5 years ago
钮海涛
47131ff13f
修复版本问题
5 years ago
钮海涛
f392a13832
Merge remote-tracking branch 'remotes/origin/master' into test
5 years ago
袁津哲
37092cf2c5
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
5 years ago
袁津哲
d65a5a3784
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
5 years ago
袁津哲
44f313abc4
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
5 years ago
宋军超
9eda1f67b7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
宋军超
40672559e4
修改sonar--BUG类型问题
5 years ago
wynne1005
8955fd2f4d
mes提测 还原pom
5 years ago
wynne1005
23754d3f18
mes提测 还原pom
5 years ago
wynne1005
81753d3260
Merge branch 'dev' into test
5 years ago
wynne1005
81b554fc8b
Merge branch 'test'
5 years ago
wynne1005
0636daed51
Finish Task:1896 Cost:8h
5 years ago
陈思洁
677cc85360
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
陈思洁
b2384619d4
【1891 队列条码打印-管理端】
5 years ago
宋军超
fd9a2e6d15
Start Task #1887 Cost:8h Left:8h
5 years ago
joke.wang
dd179a6d89
Fix Bug #8636
5 years ago
joke.wang
1a72c16f14
Finish Task #1890 Cost:8h
5 years ago
wynne1005
b48ba8c481
Finish Task #1876 Cost:32h
5 years ago
wynne1005
8aef23e4ad
Finish Task #1876 edi webservice解析 Cost:32h
5 years ago
陈思洁
4d63f9817e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
陈思洁
9b8342b7f5
【1865 客户JIT生产队列,自动下达定时JOB】
5 years ago
钮海涛
999a415d27
修复版本问题
5 years ago
钮海涛
b9cbf9684b
Merge branch 'test' into dev
5 years ago
钮海涛
4921d55bda
修复版本问题
5 years ago
钮海涛
b303cf9a14
修复合并问题
5 years ago
钮海涛
96fdbe0e07
Merge branch 'master' into test
5 years ago
袁津哲
cad6b7ad89
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
f50b76cd1f
Task1858:电枪枪头更换计数
5 years ago
陈思洁
5b167546e4
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
陈思洁
e42641855d
【8528 收货检验-图片上传】
5 years ago
wynne1005
608aa6be90
还原pom
5 years ago
wynne1005
99d3c9d721
提测合并 还原pom
5 years ago
wynne1005
5ef88c80c0
提测合并 还原pom
5 years ago
wei.peng
6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
王杰
8e94cbb8fa
pojo 序列号
5 years ago
袁津哲
8b63dea809
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
08b03c9eb8
Task1858:电枪枪头更换计数
5 years ago
宋军超
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
王杰
2b01efb15b
mes生产计划批量编制
5 years ago
wynne1005
d5f69eeefd
task 1565 发运修改
5 years ago
宋军超
92c13e5bcd
添加人员技能功能
5 years ago
wei.peng
37922cab29
POM 文件修改
...
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
5 years ago
wei.peng
8aab106aa9
合并代码 pom 冲突
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
5 years ago
宋军超
b96eb1b669
添加人员技能功能
5 years ago
陈思洁
2c50fceec9
【1693-设备状态监控看板】
5 years ago
陈思洁
87664b96cb
【合并冲突】
5 years ago
陈思洁
abd974f54f
【1693-设备状态监控看板】
5 years ago
钮海涛
3fbf532c84
修复pom版本问题
5 years ago
钮海涛
a1eb3c3bc2
修复pom版本问题
5 years ago
钮海涛
2e2ee2cc6c
Merge branch 'test' into dev
5 years ago
钮海涛
c6d36af4c9
Merge branch 'master' into test
5 years ago
joke.wang
755fccb45e
[任务:1690 产能监控看板]
5 years ago
joke.wang
ee1c2131ff
[任务:1716 写入产品下线记录]
5 years ago
joke.wang
aa9ee803b8
[任务:1683-看板管理 展示]
5 years ago
joke.wang
795312637c
[任务:1683-看板管理 计划产能]
5 years ago
joke.wang
e6f3dd5c32
[任务:1683-看板管理]
5 years ago
王杰
9da9a568f5
mes
5 years ago
joke.wang
4e02acb9e3
[任务:1683-看板管理]
5 years ago
wynne1005
fb60d75eea
还原test pom
5 years ago
wynne1005
d6fe718e4c
Merge branch 'dev' into test
5 years ago
qianhs
0a2d9a3d6d
【1432 工位扫描-ESOP展示组件开发,队列组件调整】【工位扫描-ESOP展示组件开发,队列组件调整】
5 years ago
joke.wang
fa8e4c1b55
[任务:1683 看板管理]
5 years ago
wynne1005
64f3dcf276
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
wynne1005
cfb5aab8ea
新增工步集合 repository
5 years ago
qianhs
62883c5cc0
【1432 工位扫描-ESOP展示组件开发,队列组件调整】【工位扫描-ESOP展示组件开发,队列组件调整】
5 years ago
joke.wang
43bc24340c
[料架条码打印优化]
5 years ago
wynne1005
430adb8d97
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
wynne1005
1c4050b71f
工步返回内容修改
5 years ago
王杰
74a4a1381c
mes
5 years ago
joke.wang
4c637b4e83
[写入JIT发运接口表]
5 years ago
joke.wang
48ee207a8a
[删除多余项]
5 years ago
joke.wang
d22bd22012
[任务:客户JIT自动下达]
5 years ago
宋军超
8fe5574c67
part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE")
5 years ago
陈思洁
5d8fec4938
合并冲突
5 years ago
陈思洁
7505087392
【mes 产品配方导入功能和基础数据维护】
5 years ago
王杰
0a14b533d7
任务1659 返工返修
5 years ago
曾贞一
9102a3691b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
曾贞一
10fc6ded8d
【1558 生产工单管理-泰国需求】
5 years ago
joke.wang
280385eb20
[bug: 8092 SOP信息需求变更]
5 years ago
joke.wang
54ff0deb87
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
钮海涛
efe083a9da
修复版本号
5 years ago
宋军超
e464b4d699
删除设备备件管理相关实体
5 years ago
宋军超
89a9946432
添加设备管理相关功能
5 years ago
joke.wang
b17cf60ac6
[任务:1571 生成报功数据 需求变更]
5 years ago
曾贞一
e5c275499c
【冲突解决】
5 years ago
曾贞一
255aefbcef
【1585 销售订单管理-销售订单维护】
5 years ago
wynne1005
81f05c233a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
wynne1005
93622f5dc7
中航 开线管控 提交
5 years ago
宋军超
aac4e24113
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
宋军超
b02d7372f6
添加散件bom批量导入功能
5 years ago
joke.wang
9e0fbef169
[按钮组件代码优化]
5 years ago
wynne1005
48f94c0369
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
wynne1005
cc739eac24
task `1565` 发运pojo
5 years ago
joke.wang
99e055da3c
[现场问题:111 检测项报表]
5 years ago
wynne1005
035e77c0ab
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
wynne1005
5d6588b5af
task `1565` 增加发运字段
5 years ago
陈思洁
03d2ee9246
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
陈思洁
244270684d
【泰国项目】
5 years ago
wynne1005
86713a01f2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
joke.wang
4469d92344
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
joke.wang
f1baf4fdbe
[麦格纳问题:111 检测项报表]
5 years ago
宋军超
8109275630
添加散件BOM导入
5 years ago
宋军超
69b620336f
散件BOM导入
5 years ago
wynne1005
15c9e7111b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
qianhs
ca85c59cdb
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
5 years ago
qianhs
20f5bfc9eb
wms数据同步迁移至mes
5 years ago
陈思洁
72563a4eb5
【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】
5 years ago
王杰
c6aefc89e7
test合并dev解决ct
5 years ago
王杰
94fed3b9b2
Merge branch 'test' into dev
5 years ago
joke.wang
3e33a7ac3a
[客户jit增加JIT排序号字段]
5 years ago
wynne1005
b5ecb91399
中航四月十号 内容提交
5 years ago
joke.wang
4e8c4ae46f
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
joke.wang
caf8feb374
[采集工步存入生产数据格式修改]
5 years ago
joke.wang
11adb5ff09
[麦格纳问题:111 检测项数据报表]
5 years ago
joke.wang
1d50c135ac
[麦格纳问题:87 增加工单管理页面]
5 years ago
wei.peng
aa1f7a2845
Merge remote-tracking branch 'remotes/origin/test'
5 years ago
钮海涛
4dee474c73
修改POM版本号
5 years ago
钮海涛
417120358c
Merge branch 'test' into dev
5 years ago
钮海涛
288fb4a16b
修改POM版本号
5 years ago
陈思洁
cd810ce1fc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
陈思洁
5a6c525d1f
【MES_生成条码模型增加时分秒字段】
5 years ago
王杰
3f3d0038e8
【任务:1608 数据监听预警配置,定时任务】
5 years ago
qianhs
2e85d99380
联调测试
5 years ago
wynne1005
dbba31670d
增加条码生产
5 years ago
wynne1005
17f6ac6609
删除重复字段
5 years ago
wynne1005
07d8e12216
commit stationrequestbean
5 years ago
wynne1005
2e177ba671
dev合并test test有修改
5 years ago
汪云昊
2772ea6a2f
Merge remote-tracking branch 'remotes/origin/dev' into test
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-ptl/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
5 years ago