359 Commits (62196df6bfbdaa8f614185512d8dd978840c8d6b)

Author SHA1 Message Date
Silliter 62196df6bf Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter aa1b4ac805 定时获取库存移动信息开发 6 years ago
Silliter 142e2b47c9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 74b63d8a72 开发流程管家根据任务创建流程 6 years ago
alwaysfrin 550f15cb35 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 207b7ea7eb 解决id重复问题及shiro授权bug 6 years ago
Silliter 11a2a72917 枚举类加入禁用、启用、全部 6 years ago
Silliter 41a1cc46e8 枚举条码状态调整 6 years ago
Silliter de5760bba1 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish c0841bb89c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 24b38fefb0 入库添加枚举类 6 years ago
gragon.xu 85d3463348 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu e1825eac40 交易处理组件ALL 6 years ago
Silliter d604b42c1d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
Silliter e4600e1c01 定时获取库存移动信息开发 6 years ago
alwaysfrin ab63dadb1c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 8ac4046a7d 开发校验权限和获取个人任务列表公用方法 6 years ago
wei.peng 0a5c19ebe5 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
柯裕 d2190c55c7 解决冲突 6 years ago
柯裕 8edf27d389 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 9a6a9018cf 更新枚举 6 years ago
wei.peng 6835593401 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 03fe15e2f4 自定义报表优化 6 years ago
Silliter cc4484a562 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
gragon.xu 201f960d08 冲突 6 years ago
gragon.xu 31d91f48b3 收货交易处理组件开发 6 years ago
柯裕 398a3d98c5 更新POJO 6 years ago
Jack.lv ed7857b86d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv b667d6840e 获取权限和根据权限获取任务列表 6 years ago
jimmy 89bd80ea21 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jimmy d41a4f0dc9 提交NC枚举 6 years ago
alwaysfrin 8967fd21e6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 576743ed18 自定义表单,动态对象工具 6 years ago
wei.peng 1e18495617 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 1bdc307a1b 自定义报表 折线图功能完成 6 years ago
yunhao.wang 62987c7d0f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
柯裕 f25395ebd6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 ce9cbe1198 更新pojo 6 years ago
Jack.lv 296db97c72 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv 6c6710dd67 在途库位 枚举修改 6 years ago
yunhao.wang 54bc2fe482 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 8822f4f22f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 5b6b720d7d 优化报表
单号生成规则调整重置条件
6 years ago
wei.peng 4b4fb30248 自定义报表 饼图功能完成 6 years ago
gragon.xu 44148da43c comit 6 years ago
gragon.xu 0361d6bd79 业务类型统一存数字类型;关联单据类型统一存字符串类型 6 years ago
wei.peng 86a70e758b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 44676161ad 自定义模板优化
echarts 工具新增
6 years ago
Silliter 6b419e11cb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
6 years ago
Silliter ba90dfb123 开发交易处理主程序 6 years ago