5906 Commits (2f8b0ba5dbb566d805ba132acfe1313de6c94a14)

Author SHA1 Message Date
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
qianhs 057439d050 Finish Task #2080 Cost:8h
Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
5 years ago
puxiao.liao 3173e43245 Fix bug#8742 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
钮海涛 8ec9f1b137 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 471208d051 SWEB添加条码状态枚举 5 years ago
袁津哲 12457efe93 Merge remote-tracking branch 'origin/test' into test 5 years ago
袁津哲 fb4bf4cbe2 Fix Bug #8778 5 years ago
钮海涛 97fb0bfd29 Fix Bug #8823 5 years ago
陈思洁 1cedf2b75b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 47904278c5 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
puxiao.liao 5c40073169 喜德BUG 修改 5 years ago
wynne1005 86363b2012 Finish Task #2098 Cost:8h 5 years ago
puxiao.liao 47a318f238 喜德BUG 修改 5 years ago
宋军超 1ce748eecb Fix Bug #8771 5 years ago
puxiao.liao bcb70400eb Finish Task #2027 Cost:10h 5 years ago
puxiao.liao 2133908ff5 Finish Task #2024 Cost:8h 5 years ago
钮海涛 f301abbd04 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 fd45d66968 解决合并冲突 5 years ago
joke.wang f357293ca5 plc数据类型修改 5 years ago
钮海涛 52e0d840af Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 5a0fea01ca 修复版本问题 5 years ago
汪云昊 e416b032c2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
汪云昊 4fc8c2a80d 软适配添加适配发送报文 5 years ago
puxiao.liao e57acfacee BH BUG 修改 5 years ago
puxiao.liao 454de274c7 Fix bug#8780 5 years ago
puxiao.liao 71d729b7f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 16f1ed34a5 Fix bug#8780 5 years ago
qianhs 5c31f6c54e Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs 6d4a1b6975 BH-CODE 出库,绑定 5 years ago
袁津哲 7aaa8bca6d 合并dev分支代码到test分支 5 years ago
puxiao.liao 9a65fc95fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9975335acb Finish Task #2033 Cost:8h 5 years ago
宋军超 3c1f8cf6b1 Finish Task #1889 Cost:24h 5 years ago
袁津哲 b0f3873aea Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 a8dd9831e0 Start Task #2021,2022 Cost:8h Left:8h 5 years ago
曾贞一 36f9068e4c 【冲突】 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
陈思洁 35fdc95250 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 0727370002 8660 MES-202005-PCN首检、巡检需要支持扫描产品条码录入检测值-20200527 5 years ago
wei.peng d753bdc5b6 fix(数据层): 数据库操作根据AOP对DAO的方法进行分切数据源 5 years ago
wei.peng adb95f100f Ics 日志收集功能完成 5 years ago
wei.peng 1a079a1b89 feat(自定义报表): 自定义样式功能开发
1. Pojo 实体创建
2. Service 实现唯一校验
3. 使用CRUD Controller 实现API 接口
5 years ago
陈思洁 2efab3b0cc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 01e7224d1e 【合并冲突】 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
宋军超 433a6cf744 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago