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 |