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 |