wei.peng
|
43bf2d2dba
|
菜单添加首字母缩写功能
部门管理 查询组织查询递归查询
|
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
|
e8741f7628
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
e329c69aa5
|
公用计算方法修改
|
6 years ago |
Silliter
|
52afc18c1a
|
解决冲突
|
6 years ago |
|
Silliter
|
dadd0a2f30
|
解决冲突
|
6 years ago |
gragon.xu
|
e31440345c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
456a1dc8b9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
abce5adfd7
|
修改库存移动单条码信息 状态注释
|
6 years ago |
|
Silliter
|
1594ae5843
|
解决冲突
|
6 years ago |
|
Silliter
|
2ce7eebf7b
|
解决冲突
|
6 years ago |
|
Silliter
|
91ee0d37d3
|
解决冲突
|
6 years ago |
|
wei.peng
|
4940d8f055
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
柯裕
|
0a8ffd10ec
|
组件优化
|
6 years ago |
|
wei.peng
|
ade4ec3600
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
18fa7b8e8e
|
用户菜单权限优化
|
6 years ago |
|
amy
|
0fbb0fa3ca
|
库存移动单字段修改
|
6 years ago |
|
amy
|
b146a7bd0b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
5f693abd08
|
库存移动明细
|
6 years ago |
|
Silliter
|
6ade9a50f9
|
解决冲突
|
6 years ago |
|
Silliter
|
e5b99693f7
|
解决冲突
|
6 years ago |
|
Silliter
|
01689fde87
|
解决冲突
|
6 years ago |
|
gragon.xu
|
004a7969d7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
821f7fc380
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
3c027cef03
|
解决冲突
|
6 years ago |
|
jimmy
|
586454a288
|
修改库位类型
|
6 years ago |
|
jimmy
|
9646f1b3d3
|
修改2858
|
6 years ago |
|
wei.peng
|
79ee50684e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
0988c1ad26
|
用户登录优化
|
6 years ago |
|
Silliter
|
201afe2cb0
|
流程管家业务优化
|
6 years ago |
|
Silliter
|
4346fe48f0
|
流程管家业务优化
|
6 years ago |
|
Silliter
|
4bee0dab71
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
cfd1a26b36
|
流程管家业务优化
|
6 years ago |
|
gragon.xu
|
7ddbc5f76b
|
流程管家在每次调用组件之前要验证当前redis中是否包含组件所需参数，不满足则抛异常
|
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 |
|
alwaysfrin
|
1d4ab876c1
|
添加自定义组件
|
6 years ago |
|
amy
|
0b2e06bdae
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
6821bb17cc
|
枚举名称统一
|
6 years ago |
|
amy
|
5458e82849
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
cb8d841aee
|
解决冲突
|
6 years ago |
|
amy
|
5baec35497
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
ffb29d0d03
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
acd4bb7348
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
c221d618ea
|
登录日志功能完成
|
7 years ago |
|
yunhao.wang
|
bb289774d9
|
dashboard部分功能
修复bug
|
7 years ago |
|
amy
|
8b15ad820f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
44367c9240
|
组件条件封装
|
7 years ago |
|
amy
|
90f4662416
|
内部移库单交易类型查询条件添加
|
7 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 |
|
gragon.xu
|
9e01521e21
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
620a4b0c99
|
#3015,#3017,#3018,#3041,#3045
|
7 years ago |
|
jimmy
|
33aaf8962f
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
jimmy
|
290e2e00c9
|
修改查询时间
|
7 years ago |
|
gragon.xu
|
ff572a219e
|
dragon
|
7 years ago |
|
wei.peng
|
8f8339f514
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
wei.peng
|
fba7c1a6da
|
添加 isChecked
|
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 |
|
gragon.xu
|
258bc12033
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
9449d7af99
|
解决冲突
|
7 years ago |
|
Silliter
|
c912dd4b62
|
解决冲突
|
7 years ago |
|
Silliter
|
f990cd147e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
9036a37b32
|
解决冲突
|
7 years ago |
|
gragon.xu
|
f43d392209
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
46dc170d4c
|
单元测试：流程管家逻辑处理方法入参修改
|
7 years ago |
|
wei.peng
|
878113c093
|
Merge branch 'dev' into test
|
7 years ago |
|
wei.peng
|
7a39e569dc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
3d89bae88f
|
动态 Table 功能优化
|
7 years ago |
|
wei.peng
|
adbcbb16a0
|
动态 Table 功能优化
|
7 years ago |
|
Silliter
|
85061bbc4f
|
流程管家单元测试编写
|
7 years ago |
|
wei.peng
|
2d81f1a658
|
Merge branch 'dev' into test
|
7 years ago |
|
wei.peng
|
22c9a7cc20
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
0d6963f36c
|
分支测试
|
7 years ago |
|
wei.peng
|
1139aa6d75
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
786c652900
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
95a58d97a2
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
bd3ab06440
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
wei.peng
|
0478aabfd8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
wei.peng
|
35ecf85881
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
47dd4c68b5
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
ac71b08de9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
d9214fd746
|
动态表单 基础功能完成
|
7 years ago |
|
wei.peng
|
0d7e773a49
|
动态表单 基础功能完成
|
7 years ago |
|
Silliter
|
1e579d7921
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
1d0a59ff5b
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
Silliter
|
b597df2986
|
解决代码逻辑错误问题
|
7 years ago |
|
jimmy
|
628c0c86dd
|
修改名称
|
7 years ago |