yunhao.wang
|
cb95d0a713
|
项目pom版本更新为test
|
7 years ago |
|
yunhao.wang
|
236dbc4f66
|
项目pom版本更新为dev
|
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
|
660db622a8
|
组件实体类去掉调用方法属性
|
7 years ago |
|
jimmy
|
950303231f
|
提交代码
|
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 |
|
柯裕
|
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 |
|
柯裕
|
41ecb414c1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
23e538a5a7
|
作业任务条件模糊查询
|
7 years ago |
|
gragon.xu
|
b158c70e60
|
流程管家v1
|
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 |
|
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 |
|
Silliter
|
3a97a25b4e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
Silliter
|
ac84f62e70
|
解决冲突
|
7 years ago |
|
amy
|
d616af3a00
|
检查抽点
|
7 years ago |
|
柯裕
|
e3a8fb7b12
|
修改字段
|
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
|
8e6bc17a45
|
解决冲突
|
7 years ago |
|
jessica.chen
|
b2e4c2496a
|
解决冲突
|
7 years ago |
|
gragon.xu
|
7a8baf42d7
|
冲突
|
7 years ago |
|
gragon.xu
|
cd777e00a5
|
流程管家create
|
7 years ago |
|
Silliter
|
506f13d4b2
|
解决冲突
|
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 |
|
amy
|
d2a3f4a9bf
|
返回实体代码字段添加
|
7 years ago |
|
amy
|
4d8148ea9d
|
返回实体构造添加
|
7 years ago |
|
Silliter
|
fd83bef49b
|
解决冲突
|
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 |
|
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
|
95826a1846
|
优化代码逻辑
|
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 |
|
jimmy
|
ba154986ea
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
efa5da8667
|
开发作业步骤调用
|
7 years ago |
|
jessica.chen
|
ae7c00576a
|
作业参数添加枚举状态
|
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 |
|
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 |
|
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 |
|
柯裕
|
43ebe4be72
|
修改条件数据类型匹配
|
7 years ago |
|
Silliter
|
356a238369
|
修改测试环境数据库编码
|
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 |
|
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 |
|
amy
|
31cdce0f85
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
02c8790b4c
|
库存移动行号类型修改
|
7 years ago |
|
jimmy
|
719899898f
|
添加是否库位查询条件
|
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 |
|
Silliter
|
1cd4f356fd
|
项目结构调整
|
7 years ago |
|
jessica.chen
|
145182f2da
|
更改模块
|
7 years ago |
|
jessica.chen
|
9b529bf438
|
更改模块
|
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 |
|
Silliter
|
7e25f836c4
|
项目结构调整
|
7 years ago |
|
Silliter
|
4c4edda8dd
|
项目结构调整
|
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 |
|
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 |
|
jessica.chen
|
5e9467cd35
|
更改模块
|
7 years ago |
|
Silliter
|
4aadf5adf7
|
单元测试开发工具类新增
|
7 years ago |
|
gragon.xu
|
3c1d015653
|
移库单菜单权限提交
|
7 years ago |
|
jessica.chen
|
73b35ee0aa
|
更改模块
|
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
|
fb1756198d
|
更改模块
|
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 |
|
柯裕
|
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 |
|
柯裕
|
19c635e8b2
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
|
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 |
|
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 |
|
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 |