wei.peng
|
ae08c3ef76
|
模板管理 后台功能完成
|
7 years ago |
|
wei.peng
|
19a8189b05
|
模板管理 后台功能完成
|
7 years ago |
|
wei.peng
|
2bd16137bd
|
模板管理 后台功能完成
|
7 years ago |
yunhao.wang
|
40d37ed5c9
|
文件微服务接口
报表元素 上传图片文件
|
7 years ago |
|
yunhao.wang
|
d0cee703fe
|
测试邮件发送
|
7 years ago |
|
yunhao.wang
|
e35113c519
|
报表排版实体变更
|
7 years ago |
|
wei.peng
|
1e43b2e36f
|
模板Pojo 调整
|
7 years ago |
|
wei.peng
|
324c7aa413
|
自定义报表 目录功能 联调完成
|
7 years ago |
|
wei.peng
|
86da7bcdac
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
dd9c35e6e1
|
模板Pojo 调整
模板 枚举 添加
添加枚举接口
|
7 years ago |
|
yunhao.wang
|
4c94ed04dc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
7d8feb77cd
|
报表布局接口
block service切面
|
7 years ago |
|
wei.peng
|
c5f3897bc9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
7ccd5613b3
|
目录联调Bug 修复
模板Pojo 创建
模板枚举定义
|
7 years ago |
alwaysfrin
|
cfbd536004
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
cb30fc88b2
|
添加了线程池和消息队列的交换机机制
|
7 years ago |
|
yunhao.wang
|
d9d7f5eea1
|
report url 调整
|
7 years ago |
|
yunhao.wang
|
504c3e871c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
42a38392fc
|
报表元素接口
|
7 years ago |
|
wei.peng
|
cb59664740
|
新增获取目录类型接口
新增查询关联角色接口
枚举名称调整
|
7 years ago |
|
wei.peng
|
6c0d6f6b31
|
自定义报表 数据库配置更新 创建目录管理 服务
目录功能完成
|
7 years ago |
|
wei.peng
|
6096a6205a
|
自定义报表 数据库配置更新 创建目录管理 服务
目录功能完成
|
7 years ago |
|
wei.peng
|
fd4fef9aa6
|
自定义报表 数据库配置更新 创建目录管理 服务
目录功能完成
|
7 years ago |
|
yunhao.wang
|
69d385d6d5
|
报表元素
|
7 years ago |
|
wei.peng
|
d75826f76c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
5816a93651
|
自定义报表 目录实体提交
|
7 years ago |
|
alwaysfrin
|
d7aa0bda87
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
989ad48653
|
主键生成策略调整，日志部分调整
|
7 years ago |
|
yunhao.wang
|
77296816e6
|
通用导出
单号规则导入导出
系统参数添加组
|
7 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
|
7 years ago |
|
yunhao.wang
|
c4b0e3ba0e
|
解决bug
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
|
7 years ago |
|
wei.peng
|
79ad222295
|
用户密码加密侧率功能完成
|
7 years ago |
|
alwaysfrin
|
b8a1196a45
|
添加自定义组件
|
7 years ago |
amy
|
879178697d
|
#
|
7 years ago |
|
amy
|
b2f6b3255a
|
实体修改
|
7 years ago |
Silliter
|
0f0611d9ee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
8d4d8c1b1a
|
开发返回pda实体
|
7 years ago |
|
amy
|
effa749d3f
|
#
|
7 years ago |
|
wei.peng
|
afcfad8fdb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
2498c50bfd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
47ebc8795a
|
getSingleResult优化
|
7 years ago |
|
wei.peng
|
9064b6528b
|
树形结构查列表完成
|
7 years ago |
|
yunhao.wang
|
436f8ca139
|
解决bug
|
7 years ago |
|
yunhao.wang
|
02e31b07c8
|
定时任务日志完成
解决bug
|
7 years ago |
|
wei.peng
|
b3d7cb259e
|
组织管理父节点Bug 修复
复杂查询添加默认排序
|
7 years ago |
|
wei.peng
|
5241d27279
|
账号管理功能更新
|
7 years ago |
|
yunhao.wang
|
609c1557d3
|
bug解决
|
7 years ago |
|
yunhao.wang
|
d30a3685d1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
4f828e8fab
|
定时任务重写
|
7 years ago |
|
alwaysfrin
|
2dedd836f5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
46335b8a81
|
redis会话优化
|
7 years ago |
|
Silliter
|
b8d4a3a08a
|
流程管家优化
|
7 years ago |
|
amy
|
cbf734b0b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
b4e1d97d10
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
Silliter
|
b55906ced0
|
生产领料优化
|
7 years ago |
gragon.xu
|
e167913e66
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
b41698ba1b
|
移库单信息BUG
|
7 years ago |
|
Silliter
|
a1ceda9f16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
3fcdba6c94
|
生产领料优化
|
7 years ago |
|
amy
|
339d04f56f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
a5e05ef36e
|
修改流程管家在调组件之前对组件参数的过滤条件：组件参数类型为30的不用验证，组件名为prompt的不用验证
|
7 years ago |
|
amy
|
20cdd4170c
|
盘点状态实体枚举添加
|
7 years ago |
|
yunhao.wang
|
19e134074e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
ea621d14f8
|
定时任务修改
|
7 years ago |
|
wei.peng
|
bb9444fc91
|
用户登录信息封装
|
7 years ago |
|
wei.peng
|
00715312f0
|
根据组织Id 集合、部门ID 集合 查询账号信息
|
7 years ago |
|
wei.peng
|
0550adce28
|
用户管理更新
|
7 years ago |
|
wei.peng
|
115183132d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
3750b11b88
|
用户管理更新
|
7 years ago |
|
yunhao.wang
|
6ef7931692
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
6b06d3ff04
|
bug解决
添加默认字典项
ics添加全局异常捕获
|
7 years ago |
|
amy
|
5d7e5567be
|
主表状态值更新
|
7 years ago |
|
amy
|
e4a2c6a5eb
|
移库单明细临时字段添加
|
7 years ago |
|
amy
|
9e49372cf5
|
添加hql目标文件规范化
|
7 years ago |
|
amy
|
294560df40
|
查询方法修改
|
7 years ago |
柯裕
|
1df72e1d4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
93ff5ad071
|
移动条码对象封装
|
7 years ago |
|
amy
|
f456ff2f75
|
入库上架扫描条码
|
7 years ago |
|
yunhao.wang
|
af3cd73af4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
08d8281fd5
|
定时任务
dashboard
|
7 years ago |
|
wei.peng
|
5a5ed82201
|
添加 Cloud 获取组织或者部门下面的人员信息功能完成
|
7 years ago |
|
wei.peng
|
015223fba8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
43bf2d2dba
|
菜单添加首字母缩写功能
部门管理 查询组织查询递归查询
|
7 years ago |
|
amy
|
f2d7279e94
|
计算bug修改
|
7 years ago |
jimmy
|
a9ab449316
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
jimmy
|
159892b64d
|
修改
|
7 years ago |
|
amy
|
e8741f7628
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
amy
|
e329c69aa5
|
公用计算方法修改
|
7 years ago |
|
Silliter
|
52afc18c1a
|
解决冲突
|
7 years ago |
|
Silliter
|
dadd0a2f30
|
解决冲突
|
7 years ago |
|
gragon.xu
|
e31440345c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
456a1dc8b9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
abce5adfd7
|
修改库存移动单条码信息 状态注释
|
7 years ago |
|
Silliter
|
1594ae5843
|
解决冲突
|
7 years ago |
|
Silliter
|
2ce7eebf7b
|
解决冲突
|
7 years ago |
|
Silliter
|
91ee0d37d3
|
解决冲突
|
7 years ago |
|
wei.peng
|
4940d8f055
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
0a8ffd10ec
|
组件优化
|
7 years ago |
|
wei.peng
|
ade4ec3600
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
18fa7b8e8e
|
用户菜单权限优化
|
7 years ago |
|
amy
|
0fbb0fa3ca
|
库存移动单字段修改
|
7 years ago |
|
amy
|
b146a7bd0b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
amy
|
5f693abd08
|
库存移动明细
|
7 years ago |
|
Silliter
|
6ade9a50f9
|
解决冲突
|
7 years ago |
|
Silliter
|
e5b99693f7
|
解决冲突
|
7 years ago |
|
Silliter
|
01689fde87
|
解决冲突
|
7 years ago |
|
gragon.xu
|
004a7969d7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
821f7fc380
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
3c027cef03
|
解决冲突
|
7 years ago |
|
jimmy
|
586454a288
|
修改库位类型
|
7 years ago |
|
jimmy
|
9646f1b3d3
|
修改2858
|
7 years ago |
|
wei.peng
|
79ee50684e
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
wei.peng
|
0988c1ad26
|
用户登录优化
|
7 years ago |
|
Silliter
|
201afe2cb0
|
流程管家业务优化
|
7 years ago |
|
Silliter
|
4346fe48f0
|
流程管家业务优化
|
7 years ago |
|
Silliter
|
4bee0dab71
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
cfd1a26b36
|
流程管家业务优化
|
7 years ago |
|
gragon.xu
|
7ddbc5f76b
|
流程管家在每次调用组件之前要验证当前redis中是否包含组件所需参数，不满足则抛异常
|
7 years ago |
|
yunhao.wang
|
62f601d287
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
yunhao.wang
|
5ee989b9a5
|
bug解决
|
7 years ago |
|
alwaysfrin
|
25bf0de397
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
fc2a6c515c
|
计算方法名调整为find
|
7 years ago |
|
alwaysfrin
|
3a86ae3980
|
新增通用计算方法
|
7 years ago |
|
jimmy
|
a2695771e0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
fe67546768
|
开发质检组件 扫描箱条码 扫描箱条码回显 处理箱条码
|
7 years ago |
|
alwaysfrin
|
6118568fd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
91a4386978
|
调整software序号
|
7 years ago |
|
alwaysfrin
|
1d4ab876c1
|
添加自定义组件
|
7 years ago |
|
amy
|
0b2e06bdae
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
6821bb17cc
|
枚举名称统一
|
7 years ago |
|
amy
|
5458e82849
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
cb8d841aee
|
解决冲突
|
7 years ago |
|
amy
|
5baec35497
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 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 |
|
jimmy
|
7ffe4bf190
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
09a88efc88
|
开发po订单条码表
|
7 years ago |
|
Silliter
|
03f57393f3
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
Silliter
|
4e002cda14
|
解决代码逻辑错误问题
|
7 years ago |
|
amy
|
47d3187232
|
移库单主表字段删除
|
7 years ago |
|
wei.peng
|
2a9ecbce3b
|
合并代码 并打开 MQ 以及邮箱
|
7 years ago |
|
wei.peng
|
2ad41030e6
|
合并代码 并打开 MQ 以及邮箱
|
7 years ago |
|
Silliter
|
2bedf3811d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
wei.peng
|
42b8443073
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
952d88c5f1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
cab08786f3
|
用户功能优化
|
7 years ago |
|
amy
|
f3d6ab4302
|
抽点、检查抽点修改
|
7 years ago |
|
Silliter
|
afa644d5c7
|
解决代码逻辑错误问题
|
7 years ago |
|
wei.peng
|
06927ff370
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
amy
|
8ad39b7c12
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
10939f8087
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# pom.xml
|
7 years ago |
|
Silliter
|
068978f052
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# pom.xml
|
7 years ago |
|
Silliter
|
7b98b02419
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
Silliter
|
2a451b36a7
|
合并代码测试
|
7 years ago |
|
amy
|
d3e0c18d78
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
263384eaaa
|
提交
|
7 years ago |
|
wei.peng
|
7ba903a430
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-wms into test
# Conflicts:
# modules/i3plus-wms-api/pom.xml
# modules/i3plus-wms-apiservice/pom.xml
# pom.xml
|
7 years ago |
|
amy
|
8b3434b27c
|
。。
|
7 years ago |
|
yunhao.wang
|
8e25a0c437
|
单号规则管理excel导入导出
|
7 years ago |
|
wei.peng
|
9eb7122e99
|
发布 正式版本 1.0
|
7 years ago |
|
wei.peng
|
e0f3118296
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
cb95d0a713
|
项目pom版本更新为test
|
7 years ago |
|
yunhao.wang
|
236dbc4f66
|
项目pom版本更新为dev
|
7 years ago |
|
yunhao.wang
|
336e2f2901
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
680c22e1f1
|
Excel导入导出
|
7 years ago |
|
amy
|
a3861b194d
|
modify
|
7 years ago |
|
柯裕
|
c95830289a
|
解决冲突
|
7 years ago |
|
柯裕
|
70e1c259e2
|
优化库存移动单
|
7 years ago |
|
jimmy
|
787501c59c
|
提交代码
|
7 years ago |
|
Silliter
|
d87eedb285
|
优化代码
|
7 years ago |
|
amy
|
00061db0ca
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
398de72b6c
|
内部移库单实体字段添加
|
7 years ago |
|
Silliter
|
3f5dcf9627
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
Silliter
|
ca78fb48fc
|
优化代码
|
7 years ago |
|
gragon.xu
|
a23fe003ae
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
660db622a8
|
组件实体类去掉调用方法属性
|
7 years ago |
|
Silliter
|
dbdd7834f1
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
Silliter
|
1b54063b56
|
优化代码
|
7 years ago |
|
jimmy
|
4bda89ee5b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
950303231f
|
提交代码
|
7 years ago |
|
Silliter
|
a7a39d7016
|
优化代码
|
7 years ago |
|
Silliter
|
06d801be01
|
优化代码
|
7 years ago |
|
yunhao.wang
|
7c37ce05a7
|
transient 替换为 @Transien
|
7 years ago |
|
yunhao.wang
|
838f500156
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
|
7 years ago |
|
yunhao.wang
|
d7b4b1f7ab
|
transient 替换为 @Transien
|
7 years ago |
|
jimmy
|
707d54cc1c
|
提交代码
|
7 years ago |
|
amy
|
63341ac734
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
amy
|
7706f19445
|
抽点model创建
|
7 years ago |
|
wei.peng
|
6683c2bdc1
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
5398a45033
|
Sonar Test
|
7 years ago |
|
柯裕
|
ca92b5caed
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
7982a4fdc1
|
存储区查询条件优化
|
7 years ago |
|
Silliter
|
e45e68824f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
800c77cf1d
|
解决冲突
|
7 years ago |
jessica.chen
|
af863ec5a1
|
更改质检枚举信息
|
7 years ago |
|
wei.peng
|
54d5d84a6b
|
用户管理优化
|
7 years ago |
|
柯裕
|
41ecb414c1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
23e538a5a7
|
作业任务条件模糊查询
|
7 years ago |
|
gragon.xu
|
4b5b6136d7
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
b158c70e60
|
流程管家v1
|
7 years ago |
|
yunhao.wang
|
e92db6fd26
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
203bfcb231
|
double非空判断
|
7 years ago |
|
Silliter
|
62ab7105e8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
3b61edb7ab
|
解决冲突
|
7 years ago |
|
gragon.xu
|
f66854eb42
|
dao
|
7 years ago |
|
gragon.xu
|
6ab4674a3b
|
冲突
|
7 years ago |
|
gragon.xu
|
d2672e33d4
|
冲突
|
7 years ago |
|
gragon.xu
|
805ada2d1f
|
流程管家create
|
7 years ago |
|
Silliter
|
4e44cdad24
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
11278ac43a
|
解决冲突
|
7 years ago |
|
amy
|
e8d25fc375
|
抽点比例添加工厂
|
7 years ago |
|
Silliter
|
55093f22d7
|
解决冲突
|
7 years ago |
|
Silliter
|
ab9a0aae5d
|
解决冲突
|
7 years ago |
|
柯裕
|
92b1caa276
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
05d0995463
|
set改为List
|
7 years ago |
|
amy
|
b782ea1d12
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
f9537daabf
|
查询语句
|
7 years ago |
|
wei.peng
|
85e31cdc02
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
de979cfac6
|
登录功能优化
|
7 years ago |
|
yunhao.wang
|
9871e4d8c2
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
d5bbf84965
|
hql日期封装
|
7 years ago |
|
Silliter
|
3a97a25b4e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
Silliter
|
ac84f62e70
|
解决冲突
|
7 years ago |
|
amy
|
d616af3a00
|
检查抽点
|
7 years ago |
|
Silliter
|
4042461041
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
62dcedc133
|
解决冲突
|
7 years ago |
|
柯裕
|
e3a8fb7b12
|
修改字段
|
7 years ago |
|
wei.peng
|
d039586e05
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
ad67318f27
|
添加常量
工具类代码优化
账号状态注释部分代码
|
7 years ago |
|
wei.peng
|
7f5470c34a
|
查询优化
|
7 years ago |
|
yunhao.wang
|
265c4f0afa
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
0aac978b99
|
字典管理优化
|
7 years ago |
|
Silliter
|
d2847f60ba
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
cb395f077e
|
解决冲突
|
7 years ago |
|
jessica.chen
|
b43ffb6fc3
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
69f4a95394
|
实体类已收数量添加
|
7 years ago |
|
Silliter
|
61b16569a4
|
解决冲突
|
7 years ago |
|
Silliter
|
e1d0e75c74
|
解决冲突
|
7 years ago |
|
Silliter
|
d5f04e2a30
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
8e6bc17a45
|
解决冲突
|
7 years ago |
|
jessica.chen
|
beafe050ba
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
c92d9e98e4
|
枚举修改
|
7 years ago |
|
amy
|
256c2acd41
|
条码类型枚举添加
|
7 years ago |
|
jessica.chen
|
b2e4c2496a
|
解决冲突
|
7 years ago |
|
gragon.xu
|
7a8baf42d7
|
冲突
|
7 years ago |
|
gragon.xu
|
cd777e00a5
|
流程管家create
|
7 years ago |
|
jimmy
|
7b8a6aafaf
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
76af709841
|
增加枚举
|
7 years ago |
|
Silliter
|
b0aca765ed
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
9dd0392bc0
|
解决冲突
|
7 years ago |
|
alwaysfrin
|
7e48019386
|
微服调用调整
|
7 years ago |
|
Silliter
|
be70acde35
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
506f13d4b2
|
解决冲突
|
7 years ago |
|
wei.peng
|
84446f9f68
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
2753f64b7e
|
功能代码优化
|
7 years ago |
|
Silliter
|
e1c02277b3
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
bfc1d5ba2b
|
解决冲突
|
7 years ago |
|
alwaysfrin
|
2779046bf8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
52d4a995d4
|
spring gateway添加
细节调整
|
7 years ago |
|
amy
|
d2a3f4a9bf
|
返回实体代码字段添加
|
7 years ago |
|
amy
|
4d8148ea9d
|
返回实体构造添加
|
7 years ago |
|
jessica.chen
|
08976004f8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
8bc9984e4e
|
组件中PO条码表中状态枚举
|
7 years ago |
|
Silliter
|
fd83bef49b
|
解决冲突
|
7 years ago |
|
Silliter
|
36c6d61e02
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
b77406b1e0
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/components/ScanOrderNoService.java
|
7 years ago |
|
wei.peng
|
bb9f6b28ce
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
804008410e
|
功能代码优化
|
7 years ago |
|
Silliter
|
0dbb07ea9d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
b0d191ceaa
|
解决冲突
|
7 years ago |
|
柯裕
|
4337055898
|
PO条码表
|
7 years ago |
|
Silliter
|
43ed6deb6c
|
解决冲突
|
7 years ago |
|
Silliter
|
442ec7cb5f
|
解决冲突
|
7 years ago |
|
Silliter
|
b97382f18e
|
解决冲突
|
7 years ago |
|
Silliter
|
95826a1846
|
优化代码逻辑
|
7 years ago |
|
jessica.chen
|
29bc20bce7
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
e67151271b
|
组件中单据类型枚举新增
|
7 years ago |
|
amy
|
fca1984860
|
返回实体代码字段添加
|
7 years ago |
|
jessica.chen
|
83de8099bc
|
作业参数
|
7 years ago |
|
jessica.chen
|
8553764df1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
fce89348c7
|
作业参数
|
7 years ago |
|
amy
|
c9dd7ba3cb
|
参数类型枚举添加
|
7 years ago |
|
amy
|
1deba1c026
|
实体id序列化
|
7 years ago |
|
amy
|
6178a4ce87
|
联合查询字段添加
|
7 years ago |
|
柯裕
|
64c42217d4
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
15aae342ee
|
作业记录明细字段完善
|
7 years ago |
|
gragon.xu
|
7978b37bd4
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
0a0bafca8c
|
作业步骤组件；参数测试；修改组件参数的amID加上防止前端接收long型参数精数丢失；
|
7 years ago |
|
amy
|
91e9252ed5
|
枚举添加
|
7 years ago |
|
amy
|
d2d4171e14
|
枚举添加
|
7 years ago |
|
jimmy
|
ba154986ea
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
efa5da8667
|
开发作业步骤调用
|
7 years ago |
|
gragon.xu
|
69c2961bdc
|
冲突
|
7 years ago |
|
gragon.xu
|
c1e1a87333
|
一次性加载枚举
|
7 years ago |
|
yunhao.wang
|
1e6e10e82c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
571b3043ac
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
jessica.chen
|
ae7c00576a
|
作业参数添加枚举状态
|
7 years ago |
|
yunhao.wang
|
6cab7b9d09
|
用户消息
websocket
|
7 years ago |
|
gragon.xu
|
9ad28091fa
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
df478b5ff5
|
枚举添加
|
7 years ago |
|
gragon.xu
|
baed76597f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
7154172d3b
|
test
|
7 years ago |
|
amy
|
fa54afe122
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
0c568f2107
|
添加查询条件
|
7 years ago |
|
柯裕
|
7035bdd80c
|
作业记录，作业记录明细
|
7 years ago |
|
jimmy
|
4ca1d70e0c
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
jimmy
|
911e93429e
|
修改抽点比例查询条件
|
7 years ago |
|
jessica.chen
|
fce4518982
|
解决冲突
|
7 years ago |
|
jessica.chen
|
4b410c1408
|
新增作业步骤调用参数信息和作业记录参数信息
|
7 years ago |
|
amy
|
0fe5c32fdc
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
amy
|
103a27c36e
|
作业流程与明细开发
|
7 years ago |
|
yunhao.wang
|
e0eb81177d
|
定时任务
单号生成规则
|
7 years ago |
|
wei.peng
|
1e6693db10
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
4e995eac9b
|
功能代码优化
|
7 years ago |
|
Silliter
|
f99d4e4dc6
|
修改测试环境数据库编码
|
7 years ago |
|
amy
|
7b71b349a7
|
修改
|
7 years ago |
|
amy
|
805545574a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
b93609e655
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
5dbf1bb2e8
|
自动填充信息Bug 修复
|
7 years ago |
|
gragon.xu
|
205b4701aa
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
6977e11090
|
bug
|
7 years ago |
|
jimmy
|
351aaf732c
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
37c8e3e212
|
开发作业步骤调用
|
7 years ago |
|
amy
|
20152e7efd
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
1eb12350b2
|
時間
|
7 years ago |
|
jessica.chen
|
41b0855f5d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
c2d8a35df6
|
更改物流路线信息
|
7 years ago |
|
Silliter
|
e2ebcd9430
|
修改测试环境数据库编码
|
7 years ago |
|
Silliter
|
377f5d6194
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
9c1466fdca
|
修改测试环境数据库编码
|
7 years ago |
|
jimmy
|
cdde15c1bc
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
9fefeffdb7
|
开发作业步骤调用
|
7 years ago |
|
gragon.xu
|
8f969353a6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
# modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java
|
7 years ago |
|
gragon.xu
|
da4665b0d7
|
作业步骤处理组件，参数实体，dao,sqlPack
|
7 years ago |
|
jimmy
|
42831bcff6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
e5c5e80d41
|
开发作业步骤调用
|
7 years ago |
|
Silliter
|
47bb3d6f7a
|
修改测试环境数据库编码
|
7 years ago |
|
Silliter
|
dc634e860f
|
修改测试环境数据库编码
|
7 years ago |
|
jimmy
|
fe5996b792
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
29c28271b3
|
开发作业
|
7 years ago |
|
wei.peng
|
ada91e5947
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
f248586360
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
4229601ddb
|
消息管理封装
|
7 years ago |
|
wei.peng
|
f08b2098fd
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
cbee340fbc
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
43ebe4be72
|
修改条件数据类型匹配
|
7 years ago |
|
wei.peng
|
605a438afc
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
e7f756efa7
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
0400daa0f8
|
消息队列调整
系统参数管理
数据初始化文件
|
7 years ago |
|
wei.peng
|
372d916d0f
|
异常处理优化
|
7 years ago |
|
alwaysfrin
|
0d8de0a632
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
alwaysfrin
|
48f47956a2
|
基础对象调整
|
7 years ago |
|
Silliter
|
356a238369
|
修改测试环境数据库编码
|
7 years ago |
|
alwaysfrin
|
24df1f406a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
ffcd496e4e
|
微服优化，pom调整
|
7 years ago |
|
amy
|
a1ea518108
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
2374663655
|
ASN订单明细查询条件初始化
|
7 years ago |
|
yunhao.wang
|
c25fa2563d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
9ee31a5113
|
单号生成规则
邮件配置信息来源改为系统配置信息
|
7 years ago |
|
wei.peng
|
8cd809c86a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
855d9abef8
|
1、复杂树 功能完成
|
7 years ago |
|
amy
|
f7172d63ab
|
ASN订单明细查询条件初始化
|
7 years ago |
|
Silliter
|
e9e7d37fa7
|
修改测试环境数据库编码
|
7 years ago |
|
Silliter
|
56b823d11d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
bff458438b
|
项目结构调整
|
7 years ago |
|
wei.peng
|
9a94061e5b
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
539afe3243
|
1、用户信息结构调整
|
7 years ago |
|
amy
|
31cdce0f85
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
02c8790b4c
|
库存移动行号类型修改
|
7 years ago |
|
yunhao.wang
|
e88728f712
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
f0cb40891f
|
系统资源 批量添加
|
7 years ago |
|
jimmy
|
719899898f
|
添加是否库位查询条件
|
7 years ago |
|
yunhao.wang
|
b2ba05e817
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
4421ab69ef
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/impp-framework
# Conflicts:
# modules/impp-framework-boot/src/main/java/cn/estsh/impp/framework/boot/aspect/LogServiceAspect.java
|
7 years ago |
|
jessica.chen
|
b79ed3bae2
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
5d4cb12c6c
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
2066bee025
|
单元测试
|
7 years ago |
|
jimmy
|
9cda18eb32
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
e5567ce4eb
|
修改代码
|
7 years ago |
|
jessica.chen
|
0d87b466eb
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
a3d7e3426c
|
更改模块
|
7 years ago |
|
gragon.xu
|
690d9ef408
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
b3faaf50f4
|
库存交易前后端以及(11月19日)所有的小bug
|
7 years ago |
|
alwaysfrin
|
4aa58b943d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
0e5a97f783
|
微服优化，pom调整
|
7 years ago |
|
yunhao.wang
|
963c01c93b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
80d6c1a4aa
|
操作日志添加属性
|
7 years ago |
|
wei.peng
|
470dbb015e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
ef85c84e68
|
1、BaseRepositoryImpl 根据ID 查询Bug 修复
2、更新字段名,更新对象名称
|
7 years ago |
|
Silliter
|
8d00fe7779
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
1cd4f356fd
|
项目结构调整
|
7 years ago |
frin.fei
|
80962cf2b3
|
初始化服务注册中心icloud center service
|
7 years ago |
|
frin.fei
|
86809c2027
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
frin.fei
|
9867152278
|
微服调整
|
7 years ago |
|
jessica.chen
|
145182f2da
|
更改模块
|
7 years ago |
|
jessica.chen
|
9b529bf438
|
更改模块
|
7 years ago |
|
amy
|
ccdfc19aff
|
库存移动单状态枚举添加
|
7 years ago |
|
amy
|
8841e18a4d
|
库存移动单
|
7 years ago |
|
amy
|
25a1f215f8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
fecbfe821e
|
库存订单实体字段修改
|
7 years ago |
|
jimmy
|
b2d19f7cbf
|
合并sql
|
7 years ago |
|
jimmy
|
64ea8f7fab
|
开发盘点主表、盘点冻结表、盘点实盘表
|
7 years ago |
|
jessica.chen
|
c5109d7e93
|
解决冲突
|
7 years ago |
|
jessica.chen
|
c332718ffb
|
更改模块且新增模块
|
7 years ago |
|
amy
|
2aed8cfa1d
|
库存移动单
|
7 years ago |
|
amy
|
2f991db5de
|
合并
|
7 years ago |
|
amy
|
21a79af65a
|
合并
|
7 years ago |
|
Silliter
|
71c78ec2b4
|
项目结构调整
|
7 years ago |
|
gragon.xu
|
074b861035
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
87def59c4d
|
库存，库存条码，库存交易信息，库存交易条码V1
|
7 years ago |
|
amy
|
9e340835ad
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
1dba2e2011
|
字段信息查找修改
|
7 years ago |
|
gragon.xu
|
b02c8f4674
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
# modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java
|
7 years ago |
|
gragon.xu
|
12392de1a4
|
库存，库存条码，库存交易信息，库存交易条码V1
|
7 years ago |
|
Silliter
|
9498b3e2dc
|
项目结构调整
|
7 years ago |
|
Silliter
|
46beafb09e
|
项目结构调整
|
7 years ago |
|
Silliter
|
13f9849d8e
|
项目结构调整
|
7 years ago |
|
Silliter
|
62b5dec0d6
|
项目结构调整
|
7 years ago |
|
柯裕
|
8dc237f9d4
|
解决冲突
|
7 years ago |
|
柯裕
|
f68378ba48
|
盘点子表
|
7 years ago |
|
Silliter
|
1917c01c09
|
项目结构调整
|
7 years ago |
|
柯裕
|
0634674c83
|
解决冲突
|
7 years ago |
|
柯裕
|
c87c038410
|
meiju
|
7 years ago |
|
Silliter
|
7e25f836c4
|
项目结构调整
|
7 years ago |
|
Silliter
|
4c4edda8dd
|
项目结构调整
|
7 years ago |
|
gragon.xu
|
7b8a5a2046
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
fe92584fa8
|
开窗
|
7 years ago |
|
jimmy
|
519e945f5e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
7bc674d027
|
修改字段
|
7 years ago |
|
jessica.chen
|
b7b2b8df39
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
gragon.xu
|
3fdeb69eee
|
dragon
|
7 years ago |
|
jessica.chen
|
108188b6f7
|
更改模块
|
7 years ago |
|
wei.peng
|
dec260e3ca
|
代码优化
|
7 years ago |
|
yunhao.wang
|
c92dede629
|
邮件消息队列调整
|
7 years ago |
|
yunhao.wang
|
4303d11fa5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
1b76c95b7a
|
站内信 全部完成
|
7 years ago |
|
amy
|
8798674795
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
jessica.chen
|
3da0022d64
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
aa506869cd
|
字段信息查找修改
|
7 years ago |
|
gragon.xu
|
10da7ff5bc
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
6f524abe28
|
枚举
|
7 years ago |
|
jessica.chen
|
5e9467cd35
|
更改模块
|
7 years ago |
|
Silliter
|
fb6335ec79
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
4aadf5adf7
|
单元测试开发工具类新增
|
7 years ago |
|
gragon.xu
|
3c1d015653
|
移库单菜单权限提交
|
7 years ago |
|
yunhao.wang
|
f8e6e35009
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
47901856d2
|
消息变更
|
7 years ago |
|
jessica.chen
|
6548fdb446
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
73b35ee0aa
|
更改模块
|
7 years ago |
|
wei.peng
|
36ebab9f11
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
de35193b12
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
eb8795e1a6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
d5b71f274f
|
单元测试开发工具类新增
|
7 years ago |
|
jessica.chen
|
8ff7e6b215
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
fb1756198d
|
更改模块
|
7 years ago |
|
jimmy
|
fe5538386a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
7 years ago |
|
jimmy
|
be354e6dd3
|
增加枚举
|
7 years ago |
|
wei.peng
|
d1e12bd498
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
19e107984e
|
动态功能权限 功能完成
|
7 years ago |
|
amy
|
8ab93eb53a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
40b536aa8e
|
初始化修改
|
7 years ago |
|
柯裕
|
4ebe75e66c
|
新建枚举
|
7 years ago |
|
柯裕
|
bd282d875f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
b81e502101
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
2995a1e057
|
修改查询条件
|
7 years ago |
|
柯裕
|
0cc642f9b6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
0c7eac9025
|
单元测试开发工具类新增
|
7 years ago |
|
amy
|
c82ba74e9e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
88429e342e
|
枚举修改
|
7 years ago |
|
frin.fei
|
3a34cfbd6b
|
eureka、feign整合
|
7 years ago |
|
frin.fei
|
d4f6f639d5
|
eureka、feign整合
|
7 years ago |
|
柯裕
|
19c635e8b2
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
frin.fei
|
f07489d04d
|
eureka、feign整合
|
7 years ago |
|
gragon.xu
|
675e3abb6f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
eb2ac7a408
|
修改查询条件
|
7 years ago |
|
yunhao.wang
|
7cf1bb0d23
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
4fb5f548cf
|
定时任务 完成
表达式 完成
邮件工具类
|
7 years ago |
|
jimmy
|
b4735f3469
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
jimmy
|
611fb5b601
|
修改有效性等等
|
7 years ago |
|
Silliter
|
3c32f511a7
|
单元测试开发工具类新增
|
7 years ago |
|
gragon.xu
|
e6775e65f6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
9189ca1bbd
|
前端调整
|
7 years ago |
|
wei.peng
|
fb2de0496d
|
用户图像功能完成
|
7 years ago |
|
jessica.chen
|
15f1df839b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
c66edabb7f
|
修改查询条件
|
7 years ago |
|
jessica.chen
|
aa23a3973f
|
修改抽点记录信息和产品发运信息
|
7 years ago |
|
amy
|
90dda577fb
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
d4929181c7
|
删除标识枚举更改
|
7 years ago |
|
gragon.xu
|
7cd7712912
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
# modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java
|
7 years ago |
|
gragon.xu
|
766318f1dc
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
d4fa40ed79
|
controller&service合并
|
7 years ago |
|
Silliter
|
29f4de0a8e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
014a296bcd
|
移动抽点比例信息
|
7 years ago |
|
jessica.chen
|
92f58a0162
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
538ecf84c3
|
修改拼接
|
7 years ago |
|
Silliter
|
c2746e4a84
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
762d7d4cc0
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
db8e869674
|
测试
|
7 years ago |
|
jimmy
|
1cd7f42ed5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
cf32b4c92a
|
修改PO订单明细表sql
|
7 years ago |
|
Silliter
|
d49a2661cf
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
f677400273
|
单元测试开发工具类新增
|
7 years ago |
|
yunhao.wang
|
4f246cb310
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |