wei.peng
|
212cfb02af
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
71798e9f51
|
软适配功能配置优化
|
6 years ago |
汪云昊
|
21240ffa53
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
eeff3517c6
|
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
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
|
6 years ago |
jenkins
|
dccebcd72e
|
Merge branch 'dev' into test
|
6 years ago |
许心洁
|
e8b9f58f43
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
262f7efe05
|
如果有异常信息需要叠加在提示信息前一起返回给前端
|
6 years ago |
|
汪云昊
|
07688db533
|
软适配实体
|
6 years ago |
陈思洁
|
74bdaccfbd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
8ed0d4d60e
|
枚举维护业务类型数据
|
6 years ago |
|
汪云昊
|
f2e2dd1670
|
软件适配器 数据源适配器
单号生成高并发优化
|
6 years ago |
|
wei.peng
|
21241e45ca
|
软适配功能配置优化
|
6 years ago |
 王杰
|
58d6305bd3
|
mes动作
|
6 years ago |
刘敏
|
c7734b7e26
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
5144d15ac4
|
采购单报表开发
|
6 years ago |
crish
|
2a36a7ba04
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
726600fccd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
f205373964
|
安灯事件报表安灯类型导出
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jenkins
|
03c4aa5048
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
03ef38f853
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
315787197a
|
交易处理组件（收货）：免检写入收货事务取目的库位的值+乐观锁去掉临时属性
|
6 years ago |
|
jenkins
|
c8a9560abe
|
Merge branch 'dev' into test
|
6 years ago |
 曾贞一
|
b5dfa7dbd2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
8d6e4fdfa5
|
盘点实盘导入功能
|
6 years ago |
|
陈思洁
|
677632748d
|
VDA收货逻辑组件修改--修改sql中增加库存地字段显示
|
6 years ago |
|
jenkins
|
0c269edd67
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
4c39e84094
|
asn主表添加
|
6 years ago |
|
wei.peng
|
ca28ae6cad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
0ac5232eb0
|
自定义表单 默认值取值方式修改
|
6 years ago |
|
wei.peng
|
b899c5c8c5
|
软适配 WebService 功能接口开发
|
6 years ago |
|
王杰
|
c950019077
|
pcn定时任务
|
6 years ago |
|
jenkins
|
ff1c9653c8
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
3b174fc782
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
f63cd5071b
|
新增开口合同实体
|
6 years ago |
|
许心洁
|
8fc5788f64
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
e921bb72d2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
|
6 years ago |
|
wei.peng
|
9ec5e63da6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
5b200f824f
|
软适配 WebService 功能开发
|
6 years ago |
|
汪云昊
|
3eef8ea750
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
029d7eac62
|
软适配model
|
6 years ago |
|
许心洁
|
a959964950
|
移动单三张表加上乐观锁
|
6 years ago |
|
crish
|
39e0fbca80
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
567d8cd0a7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
3266c9b1e0
|
安灯状态导出
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
wei.peng
|
e58aaf95b9
|
软适配 WebService 功能开发
|
6 years ago |
jimmy.zeng
|
2d376575a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
3c6d17a283
|
修改pojo数据类型
|
6 years ago |
|
jimmy.zeng
|
ccffe9b7bd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
229587fcf3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |