104 Commits (1750c725c612ad0612faca3b7cf1de6f44fba482)

Author SHA1 Message Date
wei.peng 1750c725c6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
wei.peng 4672bff2f8 Base Bean Bug 修改
关系表添加构造函数
7 years ago
jessica.chen 072d64859c Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jessica.chen 3c646ff823 建立库存表实体类 7 years ago
jimmy 43d8ad8fbc 修改库存交易规则 7 years ago
柯裕 d63e51fab8 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
柯裕 10520504f0 解决# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
7 years ago
Administrator f24b0516e2 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
柯裕 80b41620b1 元数据按钮实体及数据库接口 7 years ago
Administrator db09851a59 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
Administrator af2228a7b9 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 d7bf68d5ca 库存交易规则 7 years ago
Administrator f7e750e3cb wms通用数据信息与字段实体增删改查 7 years ago
jimmy da9b042cf0 修改库存交易规则 7 years ago
jimmy 26f30ec92b 修改库存交易规则 7 years ago
jimmy 468ab162a5 修改库存交易规则 7 years ago
jimmy e36c33969f 开发库存交易规则 7 years ago
Administrator cc497e8a02 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Administrator 7479104bb9 接口驱动类 7 years ago
jimmy e95c145bc5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy c398e5f11c 开发交易规则 7 years ago
wei.peng f969257dea Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
wei.peng 978bb1e8be 异常信息 添加 USER_LOGIN_NAME_EXCEPTION 7 years ago
yunhao.wang aa2c766d85 Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang 63eee71bb0 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
7 years ago
wei.peng 5335cf3b44 Merge remote-tracking branch 'origin/master' 7 years ago
wei.peng f824f73733 HQL 别名o 改为 model 7 years ago
Administrator b8f3332887 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Administrator 4cf396419d 通用接口模块开发 7 years ago
Silliter cdfa9f9822 wms工厂仓库类书写 7 years ago
Silliter 433ac603fc wms工厂仓库类书写 7 years ago
alwaysfrin 9ea6567876 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
alwaysfrin 3b0d13dca2 mongodb整合,功能优化调整 7 years ago
yunhao.wang c055bae070 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
yunhao.wang c23c091e86 硬件类型 批量删除
硬件管理     分页,排序
字典         列表查询
7 years ago
wei.peng 6ca53e59db Merge remote-tracking branch 'origin/master' 7 years ago
wei.peng 9bac06edae 组织管理功能完成 7 years ago
Silliter e7f77d19c9 wms工厂仓库类书写 7 years ago
Silliter 3f6da227e1 wms工厂仓库类书写 7 years ago
Silliter c686d32853 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter 96fcb8ab4e wms工厂仓库类书写 7 years ago
yunhao.wang 406ada5ac1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
7 years ago
yunhao.wang 888966732b 系统参数管理 复杂查询,分页,排序
字典管理     复杂查询,分页,排序
硬件类型     复杂查询,分页,排序
分页插件     开始行错误bug
7 years ago
wei.peng 4061d60660 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
wei.peng ffb0d1fd83 添加 岗位Tree
添加 部门Tree
添加 组织Tree
添加 功能Tree
7 years ago
wei.peng 44ea78b93a 添加批量删除
添加批量修改
7 years ago
alwaysfrin 1d106c9e59 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
alwaysfrin 36f6c79e66 国家化处理 7 years ago
yunhao.wang e853dd63e4 count方法类型装换,long强转为int 7 years ago
yunhao.wang 8dbcbd17be 枚举字段整理 7 years ago