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

775 Commits (8a836e340aef6f206962dec77177c372913bac29)

Author SHA1 Message Date
王杰 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
于学杰 e7913cfb26 1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV 6 years ago
WYnneaoapc 3dca11a963 add a hql 6 years ago
peter.pan 363d521c36 Merge branch 'test' 6 years ago
peter.pan d45b7b77f3 Merge branch 'dev' into test 6 years ago
WYnneaoapc 33a59fdb0f 0730 add esop pojo and respository 6 years ago
wei.peng bec3a7098d Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jenkins 25fc477991 Merge remote-tracking branch 'origin/dev' into test 6 years ago
许心洁 e9b1d7e595 添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改 6 years ago
wei.peng 9c201c70e8 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
yiming.gu 8a0ecfbaa9 新增mes查询条件 6 years ago
汪云昊 c07858d5ba Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 32b0c5080d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 088dc7dfa4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 2b59998d16 新增mes-pcn同步配置基础数据 6 years ago
许心洁 d7ba3d445a MES数据同步-POJO调整 6 years ago
jenkins 28ae6cf85d Merge remote-tracking branch 'origin/dev' into test 6 years ago
crish e874862455 socket动态配置 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
汪云昊 a37b9b60aa Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 5e46ecfe13 MES流程配置第一次完整测试JIT队列修改 6 years ago
allen.zhang 67e3851a86 Merge branch 'dev' into test 6 years ago