wei.peng
|
734340fe63
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
7b83985f40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
f6bf244b12
|
流程管家放MOVENO的BUG
|
6 years ago |
汪云昊
|
6259bd56bc
|
通用EXCEl导出MODEL
|
6 years ago |
jenkins
|
320910e2ae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
dfef27151d
|
冲突
|
6 years ago |
|
许心洁
|
f834e91353
|
Task#764+枚举TRUE_OR_FALSE
|
6 years ago |
jenkins
|
32cc1db3bf
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
peter.pan
|
62b2ea298b
|
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/WmsEnumUtil.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
|
6 years ago |
|
peter.pan
|
ea83820fbf
|
新增物料类型跟单位类型
|
6 years ago |
|
许心洁
|
b3272dc3d7
|
冲突
|
6 years ago |
|
许心洁
|
fe13a43ccc
|
WmsEnumUtil冲突（几步法）
|
6 years ago |
|
jenkins
|
ea4cde868f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
陈思洁
|
fb98db0bcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c08a569ac5
|
sql优化
数据权限实体增加字段
枚举增加数据权限的交易对象
|
6 years ago |
刘敏
|
7d0cd674cf
|
零星退料指令导入开发
|
6 years ago |
|
许心洁
|
79d1da3230
|
系统数据初始化
|
6 years ago |
|
jenkins
|
16bb8d6714
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
8e41b40196
|
excel工具类优化
|
6 years ago |
|
jenkins
|
884d4fd763
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
21746dc440
|
excel工具类优化
|
6 years ago |
|
汪云昊
|
163cb6240e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
31c347275c
|
添加重要度枚举
|
6 years ago |
|
jenkins
|
ac8b9d3986
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
b7a7eb29ae
|
安灯类型 查 表 已从表改为枚举
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
|
6 years ago |
|
jenkins
|
68fadff818
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
2adff745fb
|
自定义表单 功能优化
|
6 years ago |
|
wei.peng
|
0fb7e05e88
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
alwaysfrin
|
10c276fb16
|
自定义数据源
|
6 years ago |
|
jenkins
|
511df468ec
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
13af329513
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
|
jenkins
|
a58888df85
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
c4dceace92
|
增加动态报表对外接口-批量修改
|
6 years ago |
|
jenkins
|
878108e86f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
f2b19055d4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
3630f0c2f1
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
jenkins
|
0e70ff103a
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
94166da1ec
|
条码状态修改
|
6 years ago |
|
汪云昊
|
c07858d5ba
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
a5caf4eab5
|
供应商退货枚举新增
|
6 years ago |
|
陈思洁
|
727c1efea8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
507902473c
|
新增业务类型枚举
|
6 years ago |
|
刘敏
|
b0faa179d1
|
报废状态从条码状态移入到质量状态中
|
6 years ago |
|
jenkins
|
1a7cda72d3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
27e4fc8ec2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
28ae6cf85d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
aec4b9a85a
|
自定义表单 多数据源 功能完成
|
6 years ago |
Silliter
|
a39ce52aa9
|
呼叫升级和响应升级优化
|
6 years ago |
|
汪云昊
|
e2cfcc4c5f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
8ea762e5df
|
细节优化
|
6 years ago |