Silliter
|
b0aca765ed
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
9dd0392bc0
|
解决冲突
|
7 years ago |
alwaysfrin
|
7e48019386
|
微服调用调整
|
7 years ago |
|
alwaysfrin
|
2779046bf8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
52d4a995d4
|
spring gateway添加
细节调整
|
7 years ago |
amy
|
d2a3f4a9bf
|
返回实体代码字段添加
|
7 years ago |
|
amy
|
4d8148ea9d
|
返回实体构造添加
|
7 years ago |
jessica.chen
|
8bc9984e4e
|
组件中PO条码表中状态枚举
|
7 years ago |
wei.peng
|
bb9f6b28ce
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
804008410e
|
功能代码优化
|
7 years ago |
|
Silliter
|
43ed6deb6c
|
解决冲突
|
7 years ago |
|
Silliter
|
442ec7cb5f
|
解决冲突
|
7 years ago |
|
jessica.chen
|
e67151271b
|
组件中单据类型枚举新增
|
7 years ago |
|
amy
|
c9dd7ba3cb
|
参数类型枚举添加
|
7 years ago |
|
amy
|
91e9252ed5
|
枚举添加
|
7 years ago |
|
amy
|
d2d4171e14
|
枚举添加
|
7 years ago |
gragon.xu
|
69c2961bdc
|
冲突
|
7 years ago |
|
gragon.xu
|
c1e1a87333
|
一次性加载枚举
|
7 years ago |
|
jessica.chen
|
ae7c00576a
|
作业参数添加枚举状态
|
7 years ago |
|
gragon.xu
|
9ad28091fa
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
df478b5ff5
|
枚举添加
|
7 years ago |
|
gragon.xu
|
7154172d3b
|
test
|
7 years ago |
|
wei.peng
|
5dbf1bb2e8
|
自动填充信息Bug 修复
|
7 years ago |
yunhao.wang
|
4229601ddb
|
消息管理封装
|
7 years ago |
|
alwaysfrin
|
48f47956a2
|
基础对象调整
|
7 years ago |
|
alwaysfrin
|
24df1f406a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
ffcd496e4e
|
微服优化，pom调整
|
7 years ago |
|
wei.peng
|
855d9abef8
|
1、复杂树 功能完成
|
7 years ago |
jimmy
|
9cda18eb32
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
e5567ce4eb
|
修改代码
|
7 years ago |
|
gragon.xu
|
690d9ef408
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
b3faaf50f4
|
库存交易前后端以及(11月19日)所有的小bug
|
7 years ago |
|
alwaysfrin
|
4aa58b943d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
0e5a97f783
|
微服优化，pom调整
|
7 years ago |
|
wei.peng
|
470dbb015e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
ef85c84e68
|
1、BaseRepositoryImpl 根据ID 查询Bug 修复
2、更新字段名,更新对象名称
|
7 years ago |
frin.fei
|
80962cf2b3
|
初始化服务注册中心icloud center service
|
7 years ago |
|
frin.fei
|
86809c2027
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
frin.fei
|
9867152278
|
微服调整
|
7 years ago |
|
jessica.chen
|
145182f2da
|
更改模块
|
7 years ago |
|
jessica.chen
|
9b529bf438
|
更改模块
|
7 years ago |
|
amy
|
ccdfc19aff
|
库存移动单状态枚举添加
|
7 years ago |
|
jimmy
|
b2d19f7cbf
|
合并sql
|
7 years ago |
|
jimmy
|
64ea8f7fab
|
开发盘点主表、盘点冻结表、盘点实盘表
|
7 years ago |
|
amy
|
21a79af65a
|
合并
|
7 years ago |
|
gragon.xu
|
b02c8f4674
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
# modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java
|
7 years ago |
|
gragon.xu
|
12392de1a4
|
库存，库存条码，库存交易信息，库存交易条码V1
|
7 years ago |
柯裕
|
0634674c83
|
解决冲突
|
7 years ago |
|
柯裕
|
c87c038410
|
meiju
|
7 years ago |
|
gragon.xu
|
fe92584fa8
|
开窗
|
7 years ago |
|
gragon.xu
|
3fdeb69eee
|
dragon
|
7 years ago |
|
wei.peng
|
dec260e3ca
|
代码优化
|
7 years ago |
|
yunhao.wang
|
4303d11fa5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
1b76c95b7a
|
站内信 全部完成
|
7 years ago |
|
gragon.xu
|
6f524abe28
|
枚举
|
7 years ago |
|
Silliter
|
eb8795e1a6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
d5b71f274f
|
单元测试开发工具类新增
|
7 years ago |
|
jimmy
|
fe5538386a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
7 years ago |
|
jimmy
|
be354e6dd3
|
增加枚举
|
7 years ago |
|
柯裕
|
4ebe75e66c
|
新建枚举
|
7 years ago |
|
amy
|
c82ba74e9e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
88429e342e
|
枚举修改
|
7 years ago |
|
frin.fei
|
3a34cfbd6b
|
eureka、feign整合
|
7 years ago |
|
frin.fei
|
f07489d04d
|
eureka、feign整合
|
7 years ago |
|
yunhao.wang
|
4fb5f548cf
|
定时任务 完成
表达式 完成
邮件工具类
|
7 years ago |
|
Silliter
|
d49a2661cf
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
f677400273
|
单元测试开发工具类新增
|
7 years ago |
|
frin.fei
|
6a9ecc9543
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
frin.fei
|
b77fc7f291
|
微服调整
|
7 years ago |
|
wei.peng
|
2e8e2895c7
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
67a45fa7ac
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
f8579cdfc6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
语言管理 完成
资源管理 完成
|
7 years ago |
|
wei.peng
|
98d60b8443
|
用户信息拆分 合并代码处理
|
7 years ago |
|
wei.peng
|
6991ab1599
|
用户信息拆分
|
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 |
|
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 |
|
amy
|
ae61fad0d5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
|
yunhao.wang
|
2abfc97d8e
|
Merge remote-tracking branch 'origin/master'
|
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
|
cb34dad394
|
1，添加判断方法
2，切面中，补全新增和修改的用户基础信息
|
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
|
0e589a8bb2
|
代码调整
|
7 years ago |
|
alwaysfrin
|
ab06c1e165
|
代码优化
|
7 years ago |
|
alwaysfrin
|
6ffcdc3c33
|
日志分析工具持久化，baserepository优化
|
7 years ago |
|
alwaysfrin
|
4e343b504b
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
alwaysfrin
|
9f903fa40c
|
日志分析工具
|
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 |
|
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 |
|
Silliter
|
df8ad87dc4
|
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 |
|
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 |
|
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
|
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
|
f824f73733
|
HQL 别名o 改为 model
|
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
|
9bac06edae
|
组织管理功能完成
|
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
|
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
|
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 |
|
alwaysfrin
|
89b717b4dd
|
ignore整理
|
7 years ago |
|
wei.peng
|
f20d8cab3d
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
wei.peng
|
9bdf8b90e6
|
添加 default example
|
7 years ago |
|
wei.peng
|
1e37b8d50f
|
删除target 文件夹 或者删除.iml 文件
|
7 years ago |
|
alwaysfrin
|
bc83a59d3b
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
00f95dda13
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class
|
7 years ago |
|
alwaysfrin
|
883c31288b
|
ignore整理
|
7 years ago |
|
wei.peng
|
cdb48374ac
|
移除iml文件的版本控制
|
7 years ago |
|
wei.peng
|
9121cafcff
|
移除iml文件的版本控制
|
7 years ago |
|
alwaysfrin
|
231efdcf13
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
40a7ef7e31
|
平台功能优化
|
7 years ago |
|
alwaysfrin
|
c9ce9035e5
|
国际化
|
7 years ago |
|
alwaysfrin
|
daf65deb32
|
国家化封装
|
7 years ago |
|
wei.peng
|
aaa0a1b21b
|
初始化系统配置
|
7 years ago |
|
alwaysfrin
|
a208e592bd
|
基础对象初始化
|
7 years ago |