385 Commits (9ee31a5113443bedf2952e8aa37ee5f814f20723)

Author SHA1 Message Date
柯裕 5914c4e746 产品入库模块和作业任务模块 7 years ago
jessica.chen bf6c51b3aa Merge remote-tracking branch 'origin/master' 7 years ago
jessica.chen 6fe3f2a1ff 增加抽点记录信息 7 years ago
amy 477f6c5ff1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 22d5ba1c0f 字段修改 7 years ago
jessica.chen 8a55b01825 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 37008febab 查询条件添加 7 years ago
jessica.chen 72407a5afc 更改产品发运信息 7 years ago
gragon.xu 87048b4e42 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 73c5e20c01 移库单主表,移库单详情表 7 years ago
jimmy b9db3d0076 开发po订单主表、明细表 7 years ago
jimmy 6fc6519382 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 92d74bee7b 开发po订单主表 7 years ago
alwaysfrin ec877f57c7 Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin 58d4c25ccc 1,弱删除bug 7 years ago
gragon.xu d0b8f1649d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 41edf3f731 添加工厂代码作为查询条件;添加批量软删除方法 7 years ago
amy 1ef429fc78 添加组织代码查询条件 7 years ago
amy ae61fad0d5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 388dd96d94 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 0bacd88012 修改类名 7 years ago
alwaysfrin e2124a843e Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin f7ceb96bad 1,弱删除方法调整
2,初始化弱删除
7 years ago
amy 1263460ced 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
amy d0c6ec627c 查询条件添加 7 years ago
jessica.chen 0c8bdbeb03 Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang 2abfc97d8e Merge remote-tracking branch 'origin/master' 7 years ago
jessica.chen 67f219a433 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jessica.chen d2860e03fc 更改库存交易归档表信息和库存表信息 7 years ago
jimmy b2ad639060 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 6079c8e1a7 开发po订单主表 7 years ago
yunhao.wang 0868238a6d 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/bean/LogSystem.java
7 years ago
yunhao.wang 03ddda82d1 系统日志 全部完成
操作日志 全部完成
系统语言 全部完成
7 years ago
alwaysfrin dad173dfd0 1,对象hashcode和equals继承父对象
2,主键生成策略优化
7 years ago
alwaysfrin 6dcb783c21 是否已刪除标识 7 years ago
alwaysfrin 3f293c6746 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
alwaysfrin cb34dad394 1,添加判断方法
2,切面中,补全新增和修改的用户基础信息
7 years ago
gragon.xu 375ba45b98 物料接口对接 7 years ago
gragon.xu fd767b349e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 6ebc052d76 pojo 7 years ago
jimmy d0db4acfba Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 5f0f6402a5 增加hql语句 7 years ago
Silliter e1f8878224 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter 716ed00874 单元测试开发工具类新增 7 years ago
amy fee107d322 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy d73f134579 有效条件更改 7 years ago
柯裕 7b54382c1a 添加查询条件 7 years ago
amy ce3e2eb75a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy a1f496f8fb 实体数字类型默认值添加 7 years ago
Silliter 021b4767cd wms工厂仓库类书写 7 years ago
gragon.xu c20d801fa0 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 83c4347a8a back 7 years ago
alwaysfrin 947471e553 Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin f8e8217389 代码调整优化 7 years ago
yunhao.wang f170fb4dbb Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang 55932fd0b8 mongodb 输出简单json
重复id
7 years ago
alwaysfrin 7bccea177e Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin 0e589a8bb2 代码调整 7 years ago
gragon.xu 0df6504c56 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
gragon.xu eb168e80f4 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
gragon.xu de2325d2eb 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
amy 2108f314b1 有效条件更改 7 years ago
gragon.xu 341a340ac8 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
amy 6aad727b3d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java
7 years ago
amy aec47b10fa 供应商、作业类型基础数据 7 years ago
gragon.xu 2b1bf288e1 Part 7 years ago
jimmy e0737797eb 开发抽点比例 7 years ago
amy 0f7af655aa wms查询条件添加 7 years ago
alwaysfrin 9fea0afe19 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter 397f89f72e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter 49422a3350 wms工厂仓库类书写 7 years ago
alwaysfrin c7513710a9 Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin ab06c1e165 代码优化 7 years ago
gragon.xu 4937974f60 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 8d92834a2e PartRepository 7 years ago
Silliter b8f0183d84 wms工厂仓库类书写 7 years ago
Silliter 959291b6a9 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter 9be6f3677d wms工厂仓库类书写 7 years ago
gragon.xu 3be0585879 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu a626a6f91b PartRepository 7 years ago
gragon.xu 1d7aae1310 Part实体 7 years ago
Silliter b5abfb8eda Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter fc2258bbef wms工厂仓库类书写 7 years ago
柯裕 c7a030ee57 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 d505020af2 存储区,客户,客户发往地模块 7 years ago
jimmy 1d0373aa41 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 9137831312 开发库位、库位物料、交易类型 7 years ago
alwaysfrin a34c1e9f63 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java
7 years ago
Silliter b5aea5adb9 wms工厂仓库类书写 7 years ago
alwaysfrin 6ffcdc3c33 日志分析工具持久化,baserepository优化 7 years ago
Silliter c3db4b96bf wms工厂仓库类书写 7 years ago
Silliter 2c1736e3c7 wms工厂仓库类书写 7 years ago
amy 8f2301825b 是否有效查询条件更改 7 years ago
jimmy 83e351b50f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 21bc3a412b 开发基础数据 7 years ago
Silliter ea3518db8a wms工厂仓库类书写 7 years ago
Silliter 1dba722a42 wms工厂仓库类书写 7 years ago
wei.peng 30d2452a8d 放开注释 7 years ago
alwaysfrin 4e343b504b Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin 9f903fa40c 日志分析工具 7 years ago
amy ce597d3f2f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 69cd4c88be Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 46476549e4 修改库存交易规则 7 years ago
amy 9b4ac2b7bf Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 11dcd6be3a 仓库 7 years ago
yunhao.wang bd0c104431 字典管理 批量删除
系统信息管理 get结果判断
硬件管理     批量修改状态
7 years ago
wei.peng cde6eb0ebb Merge remote-tracking branch 'origin/master' 7 years ago
wei.peng bbe6b4f544 Base Repository 添加批量删除方法 7 years ago
jimmy 1b0a410108 修改库存交易规则 7 years ago
Silliter bef9c86454 wms工厂仓库类书写 7 years ago
wei.peng 1a3183addf Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
wei.peng 4d322c0d87 功能优化 7 years ago
jimmy b456f6c2f5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 54384429a7 增加交易状态枚举 7 years ago
alwaysfrin 52d8fc86ad Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jessica.chen 533fbc1390 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jessica.chen 9712f75d42 更改库存交易归档表信息和库存表信息 7 years ago
jessica.chen 770fe0fa17 更改库存交易归档表信息和库存表信息 7 years ago
jimmy 05c02ffd08 开发job库存交易规则 7 years ago
Silliter df8ad87dc4 wms工厂仓库类书写 7 years ago
Silliter 09ea0aa259 wms工厂仓库类书写 7 years ago
Silliter faa4fb075e wms工厂仓库类书写 7 years ago
Silliter c1ba26cbb4 wms工厂仓库类书写 7 years ago
wei.peng 6d71ac7f5e 解决冲突 7 years ago
wei.peng a0315d85ac 枚举添加注解
POJO 注解顺序调整
添加用户复杂查询
7 years ago
yunhao.wang 02c9b473e4 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 3cfcb84f50 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
yunhao.wang 830d481672 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
yunhao.wang 2c6ec19b54 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

消息管理 全部完成
文件管理 全部完成
任务表达式 全部完成
HqlPack  日期非空校验 调整
7 years ago
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
alwaysfrin dc0c0b0058 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
alwaysfrin d7b7501d19 mongodb工具方法,日志部分使用mongo 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
wei.peng 68b4778fd3 POJO 更新 7 years ago
wei.peng 06d7cf1c9f 用户权限 更新 7 years ago
yunhao.wang 9afe46a6b7 规范实体字段 7 years ago
alwaysfrin 75870afd36 跨域提交
mq发送邮件
7 years ago
yunhao.wang 834d40d55e 硬件管理 完成
硬件类型管理 完成
7 years ago
yunhao.wang 11c12f32c3 系统消息冗余字段调整
添加系统消息及硬件枚举信息
7 years ago
yunhao.wang bbc849b3d1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
yunhao.wang 1c9295769c 添加枚举:
操作日志(操作类型,操作终端)
  	消息(消息状态,消息类型)
  	-硬件(连接方式,数据类型,状态)
  	系统参数(参数类型)
7 years ago
wei.peng a1bdbd827f 添加用户枚举
SQL BUG 修复
7 years ago
wei.peng f91d524cfe Array To String Bug 修复 7 years ago
wei.peng 703fa5158a 用户增删改功能开发 7 years ago
yunhao.wang b53b6e47be 岗位命名规范 7 years ago
yunhao.wang 796824442c 岗位批量操作 7 years ago
wei.peng 5584ec7ce5 定时任务
定时任务表达式     功能完成
    定时任务           功能完成

权限
    用户管理           功能完成
    用户登录           功能完成
7 years ago
wei.peng 277ccee6a0 定时任务
定时任务表达式     功能完成
    定时任务           功能完成

权限
    用户管理           功能完成
    用户登录           功能完成
7 years ago
yunhao.wang 216fd620b4 Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang 7a9e30c24c 操作日志更名 7 years ago
wei.peng 1efbeb3d5f 定时任务
定时任务表达式     功能完成
    定时任务           功能完成

权限
    用户管理           功能完成
    用户登录           功能完成
7 years ago
alwaysfrin b61d5cc0ba Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago