crish
|
32b15fdabf
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
汪云昊
|
564deb4d6b
|
适配记录及数据库适配器
|
6 years ago |
WYnneaoapc
|
271a26d2b8
|
提交
|
6 years ago |
jenkins
|
26179650f0
|
Merge branch 'dev' into test
|
6 years ago |
许心洁
|
787f12387d
|
流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理
|
6 years ago |
|
jenkins
|
9033584a52
|
Merge branch 'dev' into test
|
6 years ago |
 钮海涛
|
70868503d4
|
add beans services controllers to aps
|
6 years ago |
|
jenkins
|
bca4f7745f
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
90b731fde4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
de6792426e
|
流程管家：单据完成提交所有待提交移动单；只推送当前移动单
PDA收货组件：改数后删除历史记录BUG修复
|
6 years ago |
wei.peng
|
33473f9903
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
ad9f532cd7
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
f51ba09666
|
提交
|
6 years ago |
|
钮海涛
|
30ecc48007
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
3c907fe88a
|
add material bean to aps
|
6 years ago |
|
crish
|
989cbbdee8
|
安灯目录结构调整
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
wei.peng
|
4ca0851386
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
 曾贞一
|
d509e5755a
|
vda 收货超收处理
|
6 years ago |
|
jenkins
|
603647bc82
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c5f43236a3
|
开口合同与po关系
|
6 years ago |
|
汪云昊
|
3474bb82c6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
f978ee39c8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
6093ec0621
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
f6c1eff0f1
|
excel通用导入优化
|
6 years ago |
于学杰
|
54db1929b1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
05dc432c57
|
1. 增加关联单位和关联数量字段
|
6 years ago |
|
汪云昊
|
d120b1615a
|
国际化工具类
|
6 years ago |
|
jenkins
|
ee979c6e02
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
9caf9a4458
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
2f904f9eee
|
数据库适配器
|
6 years ago |
|
汪云昊
|
c27449a185
|
异常信息国际化
|
6 years ago |
 王杰
|
f5164d82fb
|
通用查询方法
|
6 years ago |
jimmy.zeng
|
bd466610d5
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
刘敏
|
72fec8146d
|
修改
|
6 years ago |
|
jimmy.zeng
|
b5eb716a4e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
钮海涛
|
46bde2804d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
6008478aec
|
add customer field function
|
6 years ago |
|
jimmy.zeng
|
d23045a667
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
5b6477bba6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
510485d2f0
|
excel导出优化--单据状态显示枚举描述
|
6 years ago |
|
wei.peng
|
a86f2e49c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
51974a46b9
|
WebService 调用发送邮件测试
|
6 years ago |
|
许心洁
|
59569cef66
|
移动单主表去掉乐观锁（处理错误移动单JOB一个事务内对一个表进行了两次操作不行，导致程序直接挂掉，事务也没回滚）+
交易处理组件（出入移库）：待入库的可能是不合格的+
公共PDA组件抛异常获取值为空
|
6 years ago |
|
crish
|
630ceb254a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
35beb0c60e
|
Merge branch 'dev' into test
|
6 years ago |
|
jenkins
|
deb1779269
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
40a2a789be
|
参数描述调整
|
6 years ago |
|
wei.peng
|
377a875fec
|
软适配客户端代码结构调整。
|
6 years ago |
|
wei.peng
|
1661e4e0a9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
|
6 years ago |
|
wei.peng
|
fc1c7ab797
|
软适配添加-所有适配命令 接口
|
6 years ago |