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

394 Commits (e5767574fe98b6d89f38c814bbe814f46014f923)

Author SHA1 Message Date
王杰 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
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
王杰 5debda474d Merge branch 'dev' into test 6 years ago
王杰 2a1274df65 mes组织模型 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
陆卫豪 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
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
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 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
曾贞一 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 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
王杰 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
crish 71e7362216 PCN数据同步， 逻辑修改 
Signed-off-by: crish <570360737@qq.com>
 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
王杰 12f6e2c14b mes-pcn定时任务表维护 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
王杰 b375983304 mes条码生成规则CURD及mesbug修复 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
WYnneaoapc 5e72d98ad8 提交 6 years ago
王杰 60eadfac7a mes维护页面加模糊查询 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
王杰 e4aadf35ed mes生产工单页面按钮控制 6 years ago
王杰 4f37dc42ef pojo-mes-time-update-wangjie 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
WYnneaoapc ecba29948f 816 add method 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
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
曾贞一 f30a40520b Merge branch 'dev' into test 6 years ago