 王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
5 years ago |
 曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
 贾文涛
|
30722b130c
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
5 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
5 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
5 years ago |
|
曾贞一
|
4fcd7cbc3f
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
joke lin
|
cb09776bdb
|
[任务：1435 计划管理]
|
5 years ago |
陈思洁
|
102af98a75
|
【PTL_增加主任务编号字段和组内编号字段】
|
5 years ago |
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
5 years ago |
|
joke lin
|
ccf2817788
|
[计划管理]
|
5 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
 钮海涛
|
ca6e094271
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
luweihao
|
00252caa0c
|
移动mespcn公用model
|
5 years ago |
|
luweihao
|
005db6ac5b
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
7beaa515c8
|
task `1428` 作业流程
|
5 years ago |
joke
|
531596d2d4
|
[mes: 49 JIT计划与管理]
|
5 years ago |
|
luweihao
|
9f95e97ec3
|
Merge branch 'test'
|
5 years ago |
|
luweihao
|
7c77c90a3c
|
task 作业流程
|
5 years ago |
|
luweihao
|
dd6007656c
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
4918707fc8
|
bug `7626` 开线管控-数据存入数据库错误
|
5 years ago |
|
luweihao
|
f67dd06cd4
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
5892f87bdc
|
task `1425` pcn pojo 迁移
|
5 years ago |
|
luweihao
|
b0d214f204
|
Merge branch 'test'
|
5 years ago |
|
luweihao
|
51152656cc
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
e2d63434db
|
bug `7570` `7561` 生产扣减代码去除测试代码
|
5 years ago |
|
王杰
|
7662905caa
|
Merge branch 'test'
|
5 years ago |
jenkins
|
1ada447069
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
68cbd54f37
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
5fd51f6b1d
|
task 任务重试测试
|
5 years ago |
|
joke
|
d42b7ebbb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke
|
2b84f93950
|
任务: 1424 DT通信
|
5 years ago |
|
luweihao
|
be2f1cb146
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
5eb7cf03ed
|
task 数据同步添加错误信息字段
|
5 years ago |
|
luweihao
|
03a139e435
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
e38839db6c
|
task `1408` 数据同步修改
|
5 years ago |
|
jenkins
|
499a5ed894
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
1a2f00afc3
|
task `1408` 添加数据同步存储
|
5 years ago |
|
jenkins
|
a9d94ecff7
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
bbfcdfdd64
|
ptl pojo 提交
|
5 years ago |
|
jenkins
|
67a016b261
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
d750a88aad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
1c144eca4d
|
移除mespcn乐观锁
|
5 years ago |
|
jenkins
|
f45a0d69b0
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
54cd3cfc45
|
业务表增加唯一索引
|
5 years ago |
|
王杰
|
01e896a752
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
acc907dd28
|
task `1295` mes添加索引
|
5 years ago |
|
王杰
|
cd93680349
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
799b691aaf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
5fc59129bd
|
【mes-pojo 继承Serializable】
|
5 years ago |
|
luweihao
|
6b66c15c72
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
ab3ad4c2d5
|
task 去除生产数据注解
|
5 years ago |
|
luweihao
|
2c6a4464c3
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
667847afe7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
d3c817529f
|
task `1408` 生产数据结构化
|
5 years ago |
|
jenkins
|
521973a2f5
|
Jenkins自动合并
|
5 years ago |
|
zcg
|
8a04ca4e3d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
bc1825fd35
|
【mes枚举修改，mesModel修改,pcn枚举修改】
|
5 years ago |
|
jenkins
|
f927ee21ac
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
bf71cd07d0
|
JIS发运
|
5 years ago |
|
jenkins
|
d790bcf355
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
6ec43ea151
|
task `1392` 修正索引
|
5 years ago |
|
jenkins
|
da70df25ac
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
3f0646403f
|
【bug：7408报表优化1】
|
5 years ago |
|
王杰
|
2f5b9954d0
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
68e7dc8906
|
【bug：7408报表优化】
|
5 years ago |
|
jenkins
|
c1609539cf
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
fd1a0ebdb8
|
【任务：1404 过程质量 检查项类型分组展示】
|
5 years ago |
|
jenkins
|
7057c685cc
|
Jenkins自动合并
|
5 years ago |
|
zcg
|
2396863bab
|
【任务:1383 数据监听定时数据抓取】
|
5 years ago |
|
jenkins
|
56e53906ec
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
f1096e9ec5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
51839d7be5
|
【任务：1381】
|
5 years ago |
|
zcg
|
add40a27e3
|
【任务：1382，数据监听基础模块开发】
|
5 years ago |
|
jenkins
|
b71be613fc
|
Jenkins自动合并
|
5 years ago |
WYnneaoapc
|
ded27853a8
|
task 修改生产数据
|
5 years ago |
|
jenkins
|
3db9a86504
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
031d57e081
|
JIS
|
5 years ago |
|
jenkins
|
ebcde1d16b
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
0a70a42336
|
【任务：1381 兼容Sql server】
|
5 years ago |
许心洁
|
46b8c6babb
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
jenkins
|
75dc17f4c4
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
d0cd9d03b9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
0d7aca73a8
|
【需求：7315 生产工单变更】
|
5 years ago |
|
jenkins
|
54d6d1f340
|
Jenkins自动合并
|
5 years ago |
|
WYnneaoapc
|
b1d030e0dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
497b963f60
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
bf62494236
|
JIS
|
5 years ago |
|
WYnneaoapc
|
a9f2cf2501
|
task 1309 大数据检索
|
5 years ago |
|
王杰
|
0a0124cd2b
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
c3a7e0057b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
fea1811191
|
【bug：7153 JIT排序】
|
5 years ago |
|
王杰
|
4f8898d57a
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
bcec1d7e62
|
JIS
|
5 years ago |
|
王杰
|
f88041df1e
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
3fe50125ae
|
JIS
|
5 years ago |
|
jokelone
|
68eb60c6cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
3425a57669
|
Merge branch 'test'
|
5 years ago |
|
WYnneaoapc
|
430e5ad6dd
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
76c84631ab
|
revise class name
|
5 years ago |
|
WYnneaoapc
|
adb4bd2a1c
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
42a22d14d3
|
安灯导出字=字段冗余
|
5 years ago |
|
WYnneaoapc
|
372cc438f2
|
Merge branch 'test'
|
5 years ago |
|
jenkins
|
688d976683
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
8a4aa9fed2
|
jis发运
|
5 years ago |
|
jokelone
|
39790fd50b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
d47a097c53
|
【任务：1344 通用接口增加批量数据处理】
|
5 years ago |
|
王杰
|
9034418b7e
|
解决冲突
|
5 years ago |
|
陆卫豪
|
56fe97e200
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
WYnneaoapc
|
32c9bbbe85
|
task `1308` 4 同步国际化资源
|
5 years ago |
|
王杰
|
3ddadad142
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
fb8b07b227
|
【需求：1329】
|
5 years ago |
|
王杰
|
019cb91a4c
|
【需求：1329】
|
5 years ago |
|
王杰
|
06afd98334
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
0e84990f3c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
20f6961daf
|
【任务：1327JIT生产】
|
5 years ago |
|
王杰
|
2655fdc87f
|
Merge branch 'dev' into test
|
5 years ago |
|
zcg
|
c7d494c31e
|
[需求：1324，导出excel]
|
5 years ago |
|
jenkins
|
1fbd9c4357
|
Jenkins自动合并
|
5 years ago |
|
zcg
|
dccd104fdd
|
[需求：1324，excel导出]
|
5 years ago |
|
王杰
|
ab68895760
|
test分支修改pom
|
5 years ago |
|
王杰
|
c87b00756f
|
dev分支修改pom
|
5 years ago |
|
WYnneaoapc
|
9de807ab24
|
Merge branch 'test'
|
5 years ago |
gcj
|
a7d1ec785b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
74826e9830
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
423b81609a
|
【需求：1198】
|
5 years ago |
|
zcg
|
b06ecdd3f3
|
[bug：7043，PCN节点-模块修改]
|
5 years ago |
|
WYnneaoapc
|
51623754c7
|
Merge branch 'test'
|
5 years ago |
|
WYnneaoapc
|
0191a17a4d
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
a38dc051ac
|
task `1308` 1 PCN国际化资源
|
5 years ago |
|
jokelone
|
7dad371f27
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
7ecae4d56b
|
Merge branch 'test'
|
5 years ago |
|
jenkins
|
350f7101d2
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
b9b30cf19c
|
【任务：1306质量标准配置】
|
5 years ago |
|
王杰
|
0dac1a6d84
|
Merge branch 'test'
|
5 years ago |
|
jenkins
|
015d284239
|
Jenkins自动合并
|
5 years ago |
|
WYnneaoapc
|
48338fec28
|
task `1300` 5 BI 产线运行情况
|
5 years ago |
|
王杰
|
c4c615bd15
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
b088b40fd1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
a1a602e457
|
task `1300` 5 BI 产线运行情况
|
5 years ago |
|
jokelone
|
6995189893
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
46ec9e51b0
|
【任务：1211报表导出冗余字段】
|
5 years ago |
|
jenkins
|
6be1ef7dbd
|
Jenkins自动合并
|
5 years ago |
|
WYnneaoapc
|
b52d5b392d
|
task `1300` 4 BI 产线运行情况
|
5 years ago |
|
jokelone
|
874fd139dc
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
73cb6a7229
|
merge
|
5 years ago |
|
陆卫豪
|
0002f19d69
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
WYnneaoapc
|
e3d84dd48f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
5 years ago |
|
WYnneaoapc
|
b2daf9fd9c
|
task `1300` 1 BI 产线运行情况
|
5 years ago |
|
jokelone
|
0dfb948810
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
519d985838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
0acf17ddd7
|
【1211：报表1】
|
6 years ago |
|
WYnneaoapc
|
8694cb1f5a
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
c41026a6b2
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
f57f1087d9
|
task `1295` 1 添加数据库索引
|
6 years ago |
|
jenkins
|
af9bb85377
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
efb29aa8f4
|
task `1294-1` 查找workcell的时候需要带上产线
|
6 years ago |
|
王杰
|
e636bfaa83
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
6fc8833b01
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
9b8675c904
|
task `1292-1` 新增条码履历字段
|
6 years ago |
|
WYnneaoapc
|
ffb977ffc5
|
merge
|
6 years ago |
|
jenkins
|
2c88a30b4d
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
8dc1513947
|
bug`6897` SOP信息-编辑图片后未显示出图片地址
|
6 years ago |
|
jokelone
|
a337f1824f
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
19a2f6661e
|
Merge branch 'test'
|
6 years ago |
|
陆卫豪
|
345374354b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
fc5282342f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
056dbaacf2
|
Merge branch 'dev' into test
|
6 years ago |
|
jenkins
|
6d1d66daf3
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
f4b50200b2
|
bug`6866` 1 打印模板同步
|
6 years ago |
|
jokelone
|
a0780669c3
|
【任务：1287】
|
6 years ago |
|
jenkins
|
a2947478ca
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
edcdeb3d4f
|
【任务：1287】
|
6 years ago |
|
jenkins
|
6ee5823e15
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
917774921e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a6730b0cd8
|
【任务：1287产品类型图片】
|
6 years ago |
|
WYnneaoapc
|
64267e19b0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7069bc5cbb
|
task`1287`3` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
王杰
|
2a10fd1021
|
【组织模型工厂加id】
|
6 years ago |
|
jokelone
|
8c5eb8d7c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
c42775389d
|
【任务：1273质量检测增加字段】
|
6 years ago |
|
WYnneaoapc
|
2d7558e1ba
|
task`1287`2` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
WYnneaoapc
|
93bc62b921
|
task`1287` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
WYnneaoapc
|
2cde398cca
|
Merge branch 'test'
|
6 years ago |
|
陆卫豪
|
37f32d4269
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
a4d38de535
|
【任务：1272代码优化】
|
6 years ago |
|
陆卫豪
|
448371a461
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
d835ef1bb5
|
【任务：1273质量检测标准增加检测项类型】
|
6 years ago |
|
jokelone
|
a579358968
|
【任务：1257下线时间】
|
6 years ago |
|
jenkins
|
de173e8500
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
935ca2f4d7
|
【任务：1211报表】
|
6 years ago |
|
王杰
|
b703c9394c
|
更新 'modules/i3plus-pojo-mes/pom.xml'
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
王杰
|
b9906cee55
|
增加枚举
|
6 years ago |
|
许心洁
|
dd36a0b053
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
王杰
|
338367f3c3
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
7004ad0971
|
【任务：1211报表质量数据导出】
|
6 years ago |
|
jenkins
|
7630541146
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
52f4854621
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
60e4e1a7f3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
3c9183e422
|
【任务：1256工序BOM改为工位BOM】
|
6 years ago |