255 Commits (69d385d6d523408bbcaf7fbc1fce07db9c85f654)

Author SHA1 Message Date
yunhao.wang 69d385d6d5 报表元素 6 years ago
alwaysfrin d7aa0bda87 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 989ad48653 主键生成策略调整,日志部分调整 6 years ago
yunhao.wang 77296816e6 通用导出
单号规则导入导出
系统参数添加组
6 years ago
yunhao.wang 0263ad0a90 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
6 years ago
yunhao.wang c4b0e3ba0e 解决bug
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
6 years ago
wei.peng 79ad222295 用户密码加密侧率功能完成 6 years ago
alwaysfrin b8a1196a45 添加自定义组件 6 years ago
amy effa749d3f # 6 years ago
alwaysfrin 2498c50bfd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 47ebc8795a getSingleResult优化 6 years ago
yunhao.wang 436f8ca139 解决bug 6 years ago
yunhao.wang 02e31b07c8 定时任务日志完成
解决bug
6 years ago
wei.peng b3d7cb259e 组织管理父节点Bug 修复
复杂查询添加默认排序
6 years ago
yunhao.wang 609c1557d3 bug解决 6 years ago
yunhao.wang d30a3685d1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 4f828e8fab 定时任务重写 6 years ago
alwaysfrin 2dedd836f5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 46335b8a81 redis会话优化 6 years ago
Silliter b8d4a3a08a 流程管家优化 6 years ago
Silliter b55906ced0 生产领料优化 6 years ago
gragon.xu a5e05ef36e 修改流程管家在调组件之前对组件参数的过滤条件:组件参数类型为30的不用验证,组件名为prompt的不用验证 6 years ago
yunhao.wang ea621d14f8 定时任务修改 6 years ago
yunhao.wang 6b06d3ff04 bug解决
添加默认字典项
ics添加全局异常捕获
6 years ago
amy f456ff2f75 入库上架扫描条码 6 years ago
amy f2d7279e94 计算bug修改 6 years ago
jimmy a9ab449316 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jimmy 159892b64d 修改 6 years ago
amy e329c69aa5 公用计算方法修改 6 years ago
wei.peng 79ee50684e Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng 0988c1ad26 用户登录优化 6 years ago
yunhao.wang 62f601d287 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang 5ee989b9a5 bug解决 6 years ago
alwaysfrin 25bf0de397 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin fc2a6c515c 计算方法名调整为find 6 years ago
alwaysfrin 3a86ae3980 新增通用计算方法 6 years ago
jimmy a2695771e0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy fe67546768 开发质检组件 扫描箱条码 扫描箱条码回显 处理箱条码 6 years ago
alwaysfrin 6118568fd5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 91a4386978 调整software序号 6 years ago
yunhao.wang 6821bb17cc 枚举名称统一 6 years ago
wei.peng ffb29d0d03 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng c221d618ea 登录日志功能完成 6 years ago
yunhao.wang bb289774d9 dashboard部分功能
修复bug
6 years ago
alwaysfrin 4a89439b30 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 7 years ago
alwaysfrin f775968194 扩展块功能 7 years ago
amy 0429edfb61 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 7 years ago
amy b58b06f1a3 作业流程明细动作类型添加 7 years ago
yunhao.wang c6399fb209 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 7 years ago
yunhao.wang 4fe87c5ce2 解决bug 7 years ago