I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,536 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '517eef8e66'
${ noResults }
Commit Graph

1195 Commits (517eef8e667b36d4e9a53bbe9162f70faee0dca2)

Author SHA1 Message Date
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自动合并 6 years ago
WYnneaoapc 48338fec28 task `1300` 5 BI 产线运行情况 6 years ago
王杰 c4c615bd15 Merge branch 'dev' into test 6 years ago
WYnneaoapc b088b40fd1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc a1a602e457 task `1300` 5 BI 产线运行情况 6 years ago
jokelone 6995189893 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 46ec9e51b0 【任务：1211报表导出冗余字段】 6 years ago
jenkins 6be1ef7dbd Jenkins自动合并 6 years ago
WYnneaoapc b52d5b392d task `1300` 4 BI 产线运行情况 6 years ago
jokelone 874fd139dc Merge branch 'dev' into test 6 years ago
WYnneaoapc 73cb6a7229 merge 6 years ago
陆卫豪 0002f19d69 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 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
 6 years ago
WYnneaoapc b2daf9fd9c task `1300` 1 BI 产线运行情况 6 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
王杰 99b66e459d 【需求：1221，导入】 6 years ago
陆卫豪 2aca595bad Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 7a379fb5ab 【任务：1211报表质量数据首检导出】 6 years ago
jenkins 33f3fd0963 Jenkins自动合并 6 years ago
WYnneaoapc 1313916b81 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 55b07e8e75 1256 工序bom改为工位bom 6 years ago
王杰 8cba58d339 Merge branch 'dev' 6 years ago
王杰 5dd94058cf Merge branch 'dev' into test 6 years ago
王杰 f038ed7234 增加枚举 6 years ago
crish 9027b22af8 Merge branch 'dev' 6 years ago
王杰 be39fb2abe Merge branch 'dev' into test 6 years ago
jokelone 19c0c1deb5 【任务：1211报表】 6 years ago
WYnneaoapc 9306945691 Merge branch 'test' 6 years ago
陆卫豪 7556ada2d4 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 9e64ee8258 【需求：1221，导入】 6 years ago
jenkins 8a34eee5c5 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone a49fdf87b8 【任务：1211报表质量数据】 6 years ago
WYnneaoapc ec49074a8b Merge branch 'test' 6 years ago
王杰 e9055e3c5d Merge branch 'dev' into test 6 years ago
王杰 2893d13e9f 需求1221，导入 6 years ago
王杰 1d920627ec Merge branch 'dev' into test 6 years ago
jokelone 8a806815a5 【任务：1193qty数量类型更改为Double】 6 years ago
jokelone 327e4dcd64 【优化：27班组增加产线、班长字段】 6 years ago
王杰 a41c00f129 Merge branch 'dev' into test 6 years ago
jokelone 5bc9b9b082 【任务：1193字段类型修改】 6 years ago
王杰 dd0304d713 Merge branch 'dev' into test 6 years ago
王杰 7d623560b6 【需求：1202，条码补打】 6 years ago
jokelone 3eda200854 【bug：6545类型信息增加枚举】 6 years ago
王杰 09cf450156 Merge branch 'dev' into test 6 years ago
王杰 ca57c0342a 【需求：1202，条码补打】 6 years ago
crish 852083f667 Merge branch 'test' 6 years ago
crish 4d3adf5daf Merge branch 'dev' into test 6 years ago
王杰 4f87ec8516 解决冲突 6 years ago
jokelone c5bc44f29a 【bug：6522工位增加序号字段】 6 years ago
WYnneaoapc 81873315c3 Merge branch 'test' 6 years ago
陆卫豪 62800f757e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone ce63c161be 【任务：1211报表功能开发：生产报表】 6 years ago
crish 86171d35b7 修改master分支pom为PROD 6 years ago
王杰 ac5432bebb 解决冲突 6 years ago
王杰 71d39f54d2 Merge branch 'dev' into test 6 years ago
王杰 c595d3f6b1 修改字段 6 years ago
陆卫豪 d6ff7aa2b1 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 054502b657 【任务：1193接口调试】 6 years ago
jenkins 8eb8c2f97e Merge branch 'master' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 9f9c095846 Merge branch 'dev' into test 6 years ago
WYnneaoapc 4441d1dc86 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
WYnneaoapc 88d480403c 数据库字段初始化属性 赋值longtext 6 years ago
王杰 a595fed4fe Merge branch 'test' 6 years ago
王杰 9baac06cb7 Merge branch 'dev' into test 6 years ago
王杰 e91369c82a 【需求：1198】 6 years ago
王杰 7a023d0f4b Merge branch 'dev' into test 6 years ago
王杰 fe962c1ab3 【bug:6483】 6 years ago
王杰 3c3de49512 【bug:6483】 6 years ago
王杰 7f08847c50 Merge branch 'test' 6 years ago
王杰 6297ccc4d7 Merge branch 'dev' into test 6 years ago
jokelone 5e813f30e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone f632308d0a 【任务：1193接口数据解析】 6 years ago
王杰 2a5c32b8ea 解决冲突 6 years ago
wei.peng 02a9c64a42 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
jokelone 987a502d7e 【bug：6380 物料字段拼写有误】 6 years ago
陆卫豪 4a76c480ac Merge branch 'test' of i3-IMPP/i3plus-pojo into master 6 years ago
jenkins 4d2a2a35b0 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 f6d50bdfb7 【需求：1167，产品批量打包】 6 years ago
王杰 693ac2451e 【需求：1167，产品批量打包】 6 years ago
王杰 1a7164c474 Merge branch 'dev' into test 6 years ago
王杰 b15c3f4ae7 【需求：1101，定时任务优化】 6 years ago
jokelone 9842ed2181 【任务：1193接口pojo】 6 years ago
王杰 e60256e291 【需求：1167，包装特殊批次工步】 6 years ago
crish 5b6b303722 Merge branch 'test' 6 years ago
crish 17d5f1e512 Merge branch 'dev' into test 6 years ago
王杰 2660e0268e 【需求：1198，代码优化】 6 years ago
crish 410558d43c Merge branch 'test' 6 years ago
王杰 9137555226 Merge branch 'dev' into test 6 years ago
王杰 028d7641d2 【需求：1126，设备周期计划优化】 6 years ago
陆卫豪 3fa5437c5a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 37e288ff77 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
 6 years ago
WYnneaoapc 360f908ae4 获取生产数据 6283 6 years ago
王杰 da0478ec7e Merge branch 'dev' into test 6 years ago
王杰 ebb59cbb64 【需求:1167,批量打包】 6 years ago
王杰 093008fae8 Merge branch 'dev' into test 6 years ago
jokelone 616d39fa38 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 246726a67d 【任务：1193 接口基础数据】 6 years ago
jenkins c1b50db526 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 49637cb23f 【需求:1167,批量打包】 6 years ago
WYnneaoapc c1c00213e1 工位监控修改 6283 6 years ago
许心洁 60c25d7a71 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
许心洁 ccb29c5903 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 f5c8e36ac9 【需求：1189，产品条码工步】 6 years ago
王杰 649ffb548d Merge branch 'dev' into test 6 years ago
王杰 e30ba280e0 解决冲突 6 years ago
许心洁 208410340e Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
许心洁 b6e27c33c8 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone a04b8f7c57 【bug：5791 生产工单明细1】 6 years ago
jokelone 5fd619ac79 【bug：5791生产工单明细】 6 years ago
王杰 acaacf63a3 Merge branch 'dev' into test 6 years ago
WYnneaoapc b4cea27a5b 代码审核 修改2 6 years ago
WYnneaoapc 56e6cf7918 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
 6 years ago
crish c4d7a2380c Merge branch 'test' 6 years ago
WYnneaoapc 029c9b6bc8 代码审核 修改1 6 years ago
许心洁 970105ac19 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 9a6c5cfda3 【任务：1163客户订单】 6 years ago
陆卫豪 64be0c721c Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 9418a0838b 【任务：1129 产品编码配置基础数据】 6 years ago
陆卫豪 46fc5f5750 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc a6e8265e29 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jokelone 90ec0f107e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 32dbaed8fe 【任务：1129数据对象、对象结构、产品包装关系基础数据】 6 years ago
WYnneaoapc 4308084ca3 数据抽取修改 1130 6 years ago
陆卫豪 07a80e7fd2 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
crish 851ba63e7c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
陆卫豪 576f02f75d Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 9ad66157a8 数据同步优化 1078-4 6 years ago
王杰 2417b40635 Merge branch 'dev' into test 6 years ago
crish 6996dc2273 6204: MesConfig配置添加业务主键 6 years ago
WYnneaoapc 35f625ac21 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 563955570d 数据同步优化 1078 6 years ago
王杰 a95b6baae1 Merge branch 'dev' into test 6 years ago
jokelone 828cf66784 【需求：1090 工序BOM，物料绑定记录删除多余字段】 6 years ago
王杰 cb319e4304 【需求：1126，设备周期计划】 6 years ago
王杰 7291a7a85c Merge branch 'dev' into test 6 years ago
汪云昊 86a18d730a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 9907813aed Lac调度实体 6 years ago
许心洁 c9f26c22c1 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 6fd7e6be5f 【需求：1092 维修类型】 6 years ago
王杰 75ce77f6f1 【需求：1126，设备周期计划】 6 years ago
王杰 347c47c82f 【需求：1125，设备报表】 6 years ago
王杰 1846c6f4f8 Merge branch 'dev' into test 6 years ago
jokelone 438517be44 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
 6 years ago
jokelone 6c847cf305 【需求：1091 返厂返修添加字段和枚举】 6 years ago
王杰 2069d6a3ae 【需求：1125，设备报表】 6 years ago
王杰 9446a76159 Merge branch 'dev' into test 6 years ago
WYnneaoapc b668879f9d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 42ec1b3693 Merge branch 'dev' into test 6 years ago
王杰 2f382d37cc 【需求：1124，首检件配置】 6 years ago
王杰 dcaf007f4d 【需求：1107，生产工单首检件】 6 years ago
WYnneaoapc 29ac92566d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 6d59aeddad Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jiajack 3c8b920a4c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 95789b1bd8 增加生产质量情况BI业务 6 years ago
许心洁 c79786a677 合并开发分支的代码POM文件被改成DEV修改回TEST 6 years ago
WYnneaoapc dbd4a7578b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 88af19f8e9 修改开发环境pom文件test为dev 6 years ago
changjiang.gao 376ca4bbd4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 3f6f6428f6 【需求:1106,设备通知，优化】 6 years ago
WYnneaoapc 04c99167c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 6de6d36e80 数据库抽取反写 1105-1 6 years ago
王杰 03a4c98234 Merge branch 'dev' into test 6 years ago
王杰 803d5c57f2 【需求1101，设备维修作业，第3次提交】 6 years ago
crish 18161e8191 Merge branch 'test' 6 years ago
crish 67461457fc Merge branch 'dev' into test 6 years ago
WYnneaoapc 848f6b2f23 工位监控优化 1050-6 6 years ago
WYnneaoapc c71d667d0f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 56996126be 【需求：1101，mes同步设备安灯维修任务】 6 years ago
changjiang.gao 30007cee47 Merge branch 'dev' into test 6 years ago
王杰 9bdae2ad13 【需求：1086，设备点检保养作业】 6 years ago
WYnneaoapc c56822dc40 工位监控优化 1050-5 6 years ago
WYnneaoapc 3dbbee3c60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack f6b06e6b52 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack aef7f7a948 增加班次顺序字段 6 years ago
jiajack d87d81e34a 【产线运行情况】-BI报表开发 6 years ago
许心洁 73aef5326c Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 00e849a62e (1089 过程质量检测基础数据；1090 返厂返修基础数据) 6 years ago
WYnneaoapc 34a9ad36fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 44fccb14d6 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 0c01648551 【需求：1088，设备维修作业】 6 years ago
WYnneaoapc b47f97fa05 1050-2 工位监控 6 years ago
王杰 752476b3df [需求1086，设备点检保养作业，第2次提交] 6 years ago
许心洁 04df70114d Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 07749b50ec [需求：1086， mes设备点检保养作业] 6 years ago
crish 15e812c7a6 Merge branch 'test' 6 years ago
陆卫豪 9558225174 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 081d792b98 mes设备通知 6 years ago
crish 0526da8ee3 Merge branch 'test' 6 years ago
刘辉 e89df89f9a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 0d0178545c mes设备 6 years ago
WYnneaoapc 1eca1a963a Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
 6 years ago
WYnneaoapc 2da78c3237 idea 异常 文件格式化 + 包装扫描工步 6 years ago
jokelone 9e4930968f 解决冲突 6 years ago
jokelone 8a517bc0b9 返厂返修增加字段 6 years ago
王杰 b0f85a2bdc Merge branch 'dev' into test 6 years ago
王杰 1d3fc8b5c9 mes作业任务 6 years ago
crish 1de89d732b 本地误拉了test代码，解决pom 6 years ago
crish 9f9874902d 冲突解决 6 years ago
曾贞一 e603ac66a7 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 5a036f14cb mes设备作业任务 6 years ago
jokelone 7fc439319e 返厂返修 6 years ago
陆卫豪 413266293e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 030391a93c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 56d7457826 工位监控提交 6 years ago
王杰 b561110e54 Merge branch 'dev' into test 6 years ago
王杰 9cc89f9397 mes设备周期计划 6 years ago
王杰 ef3be61f66 Merge branch 'dev' into test 6 years ago
王杰 14123c008e mes设备周期计划 6 years ago
王杰 611b25abfd Merge branch 'dev' into test 6 years ago
王杰 9a6b1c4bf1 mes设备作业周期计划 6 years ago
jokelone 2238bee7d4 增加查询结果设备名称 6 years ago
许心洁 7863325afd 本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原 6 years ago
许心洁 b7b78b85ac 误拉了test分支的代码：还原 6 years ago
王杰 2ed8ebdbd7 Merge branch 'dev' into test 6 years ago
王杰 37f7e92d53 mes实体类 6 years ago
许心洁 8deff73454 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 5d730ed5c8 解决冲突 6 years ago
jokelone 72bdd253fa 解决冲突 6 years ago
许心洁 a961da57ef Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 9e2b13e3ad 解决冲突 6 years ago
jokelone 104d308d30 PLC DB 设备故障 过程质量检测 6 years ago
许心洁 b22c6fbcaf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 d814887570 mes设备 6 years ago
陆卫豪 a791430fec Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc df6f432534 1012 修改绑定关键件 和 工序bom添加isBindKey 6 years ago
许心洁 f778b15ea5 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish 40321ed7ec Merge branch 'test' 6 years ago
crish 4e2373bdae Merge branch 'dev' into test 6 years ago
WYnneaoapc 20843e06a6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 4654fad2bd 1011 生成条码工步 6 years ago
王杰 096c02d42d 修改 6 years ago
王杰 24a3b0e2b0 mes字段 6 years ago
crish 672438f2c0 Merge branch 'test' 6 years ago
王杰 5debda474d Merge branch 'dev' into test 6 years ago
王杰 2a1274df65 mes组织模型 6 years ago
crish 0924810e64 Merge branch 'test' 6 years ago
王杰 921859f4de Merge branch 'dev' into test 6 years ago
王杰 6c54f204b7 mes设备 6 years ago
王杰 982f8ad741 mes设置组织模型 6 years ago
许心洁 c955047746 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 95cc0b433e mes组织模型bug修复 6 years ago
WYnneaoapc 60f441e685 Merge branch 'dev' into test 6 years ago
WYnneaoapc 18ec7d091a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc c9a572469c 同步限制解除 6 years ago
刘辉 60d1798b9c Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 ddfb47e6ac mes设备台账功能开发 6 years ago
许心洁 1e41ab2e39 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
陆卫豪 6c434e114d Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 4eada1c343 表同步 6 years ago
许心洁 e35cf183da Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 82fe491bd3 #1050 工位监控 6 years ago
许心洁 7a403a37da Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
jenkins 30eee05b1c Merge branch 'dev' into test 6 years ago
WYnneaoapc 766d195088 开线合并代码 6 years ago
WYnneaoapc 183fd78eac 冲突解决 6 years ago
王杰 80f50fe800 Merge branch 'dev' into test 6 years ago
王杰 804574090f pcn生产工单 6 years ago
crish 9ae6ee5016 Merge branch 'test' 6 years ago
jenkins f07764acda Merge branch 'dev' into test 6 years ago
王杰 80bad03881 mes-pcn生产工单 6 years ago
WYnneaoapc f96cbd1be3 Merge branch 'dev' into test 6 years ago
WYnneaoapc 033b23321f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 7c472b386a 提交 6 years ago
jenkins 6250794847 Merge branch 'dev' into test 6 years ago
王杰 704d4f2098 mes生产工单 6 years ago
王杰 f24744a1f6 Merge branch 'dev' into test 6 years ago
王杰 e5a20d4733 生产工单 6 years ago
jenkins cbc5882bd5 Merge branch 'dev' into test 6 years ago
王杰 d676bcf974 mes生产工单下达配置状态 6 years ago
crish 4b17c6ca69 Merge branch 'dev' into test 6 years ago
王杰 310d0f0606 mes生产工单审批 6 years ago
crish f3f77e63b3 Merge branch 'test' 6 years ago
crish 4d5497929a Merge branch 'dev' into test 6 years ago
王杰 9b82b0be2a mes班组维护 6 years ago
crish c47c617aab Merge branch 'dev' into test 6 years ago
王杰 8570b88761 mes生产工单 6 years ago
crish c17039ce4a Merge branch 'dev' into test 6 years ago
WYnneaoapc 4e1635fe7e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 9b0c5de954 提交 6 years ago
曾贞一 6c8cfd8678 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
曾贞一 a4262c5e1e pom文件修改 dev改成test 6 years ago
crish b473fd1b46 pojo开发环境 pom文件修改为dev 6 years ago
crish 87f8dc38a6 测试环境 6 years ago
crish d82e025eb9 dev环境pom文件修改为dev 6 years ago
crish 52a770ad45 Merge branch 'dev' into test 6 years ago
王杰 24a31c0bdf 生产工单实体 6 years ago
crish 03a5481210 Merge branch 'dev' into test 6 years ago
王杰 9ed873422e mes生产计划 6 years ago
于学杰 f6bb2ee21f Merge branch 'dev' into test 6 years ago
王杰 2460fbc3b4 生产计划 6 years ago
crish 23c59d4326 Merge branch 'dev' into test 6 years ago
WYnneaoapc 271a26d2b8 提交 6 years ago
crish ad9f532cd7 Merge branch 'dev' into test 6 years ago
WYnneaoapc f51ba09666 提交 6 years ago
jenkins ee979c6e02 Merge branch 'dev' into test 6 years ago
王杰 f5164d82fb 通用查询方法 6 years ago
crish 35beb0c60e Merge branch 'dev' into test 6 years ago
王杰 58d6305bd3 mes动作 6 years ago
crish bbfc9b320f Merge branch 'test' 6 years ago
crish 4a1ad40dfa Merge branch 'dev' into test 6 years ago
王杰 c950019077 pcn定时任务 6 years ago
jimmy.zeng ccffe9b7bd Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc 61a7985afc 提交 0905 6 years ago
WYnneaoapc 546d9dc7a5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 61ed3d821d 提交 0905 6 years ago
jimmy.zeng fd76f08af4 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 d2995520d4 mes-pcn定时任务增加字段 6 years ago
WYnneaoapc 4b982fc4fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 1332f11a23 提交 6 years ago
jimmy.zeng 8f1ac3fdae Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish 65cb39d7ba 工作中心代码修改 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
jimmy.zeng 2e8a70d8b4 pom版本还原--pojo 6 years ago
王杰 46d220f3ec mes条码规则校验 6 years ago
WYnneaoapc cbcdcabd82 测试修改提交 6 years ago
WYnneaoapc 7f3f39af06 提交 6 years ago
WYnneaoapc 63c0f02f32 提交 6 years ago
WYnneaoapc 146cf768d6 提交 6 years ago
crish 5e06022e51 Merge remote-tracking branch 'remotes/origin/dev' 6 years ago
王杰 2e86ff81d0 mes工作单元参数增加枚举 6 years ago
王杰 09eee24769 mes工作单元参数CRUD 6 years ago
王杰 8034e104c8 mes工作单元参数 6 years ago
王杰 5388c4405b mes-pcn-task表修改 6 years ago
crish 6e5176c3fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 9981c4089b 修改唯一性校验， 不能新增禁用的信息 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
王杰 6929e88570 mes-pcn定时任务 6 years ago
曾贞一 ceac2db551 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 399a51b044 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish 71e7362216 PCN数据同步， 逻辑修改 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
曾贞一 ae12af551b Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 1b06c1d07f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc 3bedf8fb8d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
 6 years ago
WYnneaoapc 953f593207 提交 6 years ago
曾贞一 25e7ca08d3 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 59047b5b4c Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 12f6e2c14b mes-pcn定时任务表维护 6 years ago
crish f7b366fe29 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish c584f2e048 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 12a2a27b18 mes， pcn条码打印 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
曾贞一 18aff86ea0 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 6d925d6b9f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 b375983304 mes条码生成规则CURD及mesbug修复 6 years ago
jimmy.zeng c901f18f89 pom版本还原 6 years ago
WYnneaoapc c7842e63a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 2deb384cca 提交 6 years ago
曾贞一 b10b967b73 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
WYnneaoapc 5e72d98ad8 提交 6 years ago
jimmy.zeng d340133e7a Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 60eadfac7a mes维护页面加模糊查询 6 years ago
jimmy.zeng 4359f347c6 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc 4ff3677fba Merge branch 'test' into dev 6 years ago
WYnneaoapc 0aef9adac9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 1328dc7ddd #Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 6 years ago
jimmy.zeng a2a4dc6beb Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 e4aadf35ed mes生产工单页面按钮控制 6 years ago
王杰 4f37dc42ef pojo-mes-time-update-wangjie 6 years ago
曾贞一 e1cb06da5c Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 483ea59142 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc ef1450e912 Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 6 years ago
汪云昊 b9d9d7402e Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 7002ac5a8a Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc ecba29948f 816 add method 6 years ago
曾贞一 fbe8544a02 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 78267a3a45 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc 0f99cb1027 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 5df9896258 维修， 报废， 系统配置， pcn节点基础数据接口 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
曾贞一 7a62200736 Merge remote-tracking branch 'remotes/origin/test' 
# Conflicts:
#	modules/i3plus-pojo-andon/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-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
 6 years ago
WYnneaoapc 66e20acfe9 0730 Add File Operation in ODS Module untested 6 years ago
曾贞一 7ca6e46e4b Merge branch 'dev' into test 6 years ago
crish 0e444aa993 PCN接口开发， 数据同步配置 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
曾贞一 47d4a53706 Merge branch 'dev' 
# Conflicts:
#	modules/i3plus-pojo-andon/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-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
 6 years ago
曾贞一 f30a40520b Merge branch 'dev' into test 6 years ago
WYnneaoapc d826c47d5a 修改了mesEvent pojo 6 years ago
曾贞一 8b457c0618 DEV 合并 TEST pom.xml文件修改 6 years ago