I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,743 Commits
1 Branch
0 Tags
20 MiB
Commit Graph

1711 Commits (dac82b197776db31783d12f90c0b392fc64a6468)

Author SHA1 Message Date
amy 879178697d #
amy b2f6b3255a 实体修改
Silliter 0f0611d9ee Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 8d4d8c1b1a 开发返回pda实体
amy effa749d3f #
wei.peng afcfad8fdb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 2498c50bfd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 47ebc8795a getSingleResult优化
wei.peng 9064b6528b 树形结构查列表完成
yunhao.wang 436f8ca139 解决bug
yunhao.wang 02e31b07c8 定时任务日志完成 
解决bug
wei.peng b3d7cb259e 组织管理父节点Bug 修复 
复杂查询添加默认排序
wei.peng 5241d27279 账号管理功能更新
yunhao.wang 609c1557d3 bug解决
yunhao.wang d30a3685d1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 4f828e8fab 定时任务重写
alwaysfrin 2dedd836f5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 46335b8a81 redis会话优化
Silliter b8d4a3a08a 流程管家优化
amy cbf734b0b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter b4e1d97d10 Merge remote-tracking branch 'origin/dev' into dev
Silliter b55906ced0 生产领料优化
gragon.xu e167913e66 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu b41698ba1b 移库单信息BUG
Silliter a1ceda9f16 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 3fcdba6c94 生产领料优化
amy 339d04f56f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu a5e05ef36e 修改流程管家在调组件之前对组件参数的过滤条件：组件参数类型为30的不用验证，组件名为prompt的不用验证
amy 20cdd4170c 盘点状态实体枚举添加
yunhao.wang 19e134074e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang ea621d14f8 定时任务修改
wei.peng bb9444fc91 用户登录信息封装
wei.peng 00715312f0 根据组织Id 集合、部门ID 集合 查询账号信息
wei.peng 0550adce28 用户管理更新
wei.peng 115183132d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 3750b11b88 用户管理更新
yunhao.wang 6ef7931692 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 6b06d3ff04 bug解决 
添加默认字典项
ics添加全局异常捕获
amy 5d7e5567be 主表状态值更新
amy e4a2c6a5eb 移库单明细临时字段添加
amy 9e49372cf5 添加hql目标文件规范化
amy 294560df40 查询方法修改
柯裕 1df72e1d4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 93ff5ad071 移动条码对象封装
amy f456ff2f75 入库上架扫描条码
yunhao.wang af3cd73af4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 08d8281fd5 定时任务 
dashboard
wei.peng 5a5ed82201 添加 Cloud 获取组织或者部门下面的人员信息功能完成
wei.peng 015223fba8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 43bf2d2dba 菜单添加首字母缩写功能 
部门管理 查询组织查询递归查询
amy f2d7279e94 计算bug修改
jimmy a9ab449316 Merge remote-tracking branch 'origin/dev' into dev
jimmy 159892b64d 修改
amy e8741f7628 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
amy e329c69aa5 公用计算方法修改
Silliter 52afc18c1a 解决冲突
Silliter dadd0a2f30 解决冲突
gragon.xu e31440345c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy 456a1dc8b9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy abce5adfd7 修改库存移动单条码信息 状态注释
Silliter 1594ae5843 解决冲突
Silliter 2ce7eebf7b 解决冲突
Silliter 91ee0d37d3 解决冲突
wei.peng 4940d8f055 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 0a8ffd10ec 组件优化
wei.peng ade4ec3600 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 18fa7b8e8e 用户菜单权限优化
amy 0fbb0fa3ca 库存移动单字段修改
amy b146a7bd0b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
amy 5f693abd08 库存移动明细
Silliter 6ade9a50f9 解决冲突
Silliter e5b99693f7 解决冲突
Silliter 01689fde87 解决冲突
gragon.xu 004a7969d7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 821f7fc380 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 3c027cef03 解决冲突
jimmy 586454a288 修改库位类型
jimmy 9646f1b3d3 修改2858
wei.peng 79ee50684e Merge remote-tracking branch 'origin/dev' into dev
wei.peng 0988c1ad26 用户登录优化
Silliter 201afe2cb0 流程管家业务优化
Silliter 4346fe48f0 流程管家业务优化
Silliter 4bee0dab71 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter cfd1a26b36 流程管家业务优化
gragon.xu 7ddbc5f76b 流程管家在每次调用组件之前要验证当前redis中是否包含组件所需参数，不满足则抛异常
yunhao.wang 62f601d287 Merge remote-tracking branch 'origin/dev' into dev
yunhao.wang 5ee989b9a5 bug解决
alwaysfrin 25bf0de397 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin fc2a6c515c 计算方法名调整为find
alwaysfrin 3a86ae3980 新增通用计算方法
jimmy a2695771e0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy fe67546768 开发质检组件 扫描箱条码 扫描箱条码回显 处理箱条码
alwaysfrin 6118568fd5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 91a4386978 调整software序号
alwaysfrin 1d4ab876c1 添加自定义组件
amy 0b2e06bdae Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 6821bb17cc 枚举名称统一
amy 5458e82849 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang cb8d841aee 解决冲突
amy 5baec35497 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng ffb29d0d03 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang acd4bb7348 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng c221d618ea 登录日志功能完成
yunhao.wang bb289774d9 dashboard部分功能 
修复bug
amy 8b15ad820f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 44367c9240 组件条件封装
amy 90f4662416 内部移库单交易类型查询条件添加
alwaysfrin 4a89439b30 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin f775968194 扩展块功能
gragon.xu 9e01521e21 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu 620a4b0c99 #3015,#3017,#3018,#3041,#3045
jimmy 33aaf8962f Merge remote-tracking branch 'origin/dev' into dev
jimmy 290e2e00c9 修改查询时间
gragon.xu ff572a219e dragon
wei.peng 8f8339f514 Merge remote-tracking branch 'origin/dev' into dev
wei.peng fba7c1a6da 添加 isChecked
amy 0429edfb61 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
amy b58b06f1a3 作业流程明细动作类型添加
yunhao.wang c6399fb209 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 4fe87c5ce2 解决bug
gragon.xu 258bc12033 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 9449d7af99 解决冲突
Silliter c912dd4b62 解决冲突
Silliter f990cd147e Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter 9036a37b32 解决冲突
gragon.xu f43d392209 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu 46dc170d4c 单元测试：流程管家逻辑处理方法入参修改
wei.peng 878113c093 Merge branch 'dev' into test
wei.peng 7a39e569dc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 3d89bae88f 动态 Table 功能优化
wei.peng adbcbb16a0 动态 Table 功能优化
Silliter 85061bbc4f 流程管家单元测试编写
wei.peng 2d81f1a658 Merge branch 'dev' into test
wei.peng 22c9a7cc20 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 0d6963f36c 分支测试
wei.peng 1139aa6d75 冲突解决 合并代码
wei.peng 786c652900 冲突解决 合并代码
wei.peng 95a58d97a2 冲突解决 合并代码
wei.peng bd3ab06440 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wei.peng 0478aabfd8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wei.peng 35ecf85881 冲突解决 合并代码
wei.peng 47dd4c68b5 配置文件修改 Test to dev
wei.peng ac71b08de9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng d9214fd746 动态表单 基础功能完成
wei.peng 0d7e773a49 动态表单 基础功能完成
Silliter 1e579d7921 Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter 1d0a59ff5b Merge remote-tracking branch 'origin/dev' into dev
Silliter b597df2986 解决代码逻辑错误问题
jimmy 628c0c86dd 修改名称
jimmy 7ffe4bf190 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy 09a88efc88 开发po订单条码表
Silliter 03f57393f3 Merge remote-tracking branch 'origin/dev' into dev
Silliter 4e002cda14 解决代码逻辑错误问题
amy 47d3187232 移库单主表字段删除
wei.peng 2a9ecbce3b 合并代码 并打开 MQ 以及邮箱
wei.peng 2ad41030e6 合并代码 并打开 MQ 以及邮箱
Silliter 2bedf3811d Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng 42b8443073 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 952d88c5f1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng cab08786f3 用户功能优化
amy f3d6ab4302 抽点、检查抽点修改
Silliter afa644d5c7 解决代码逻辑错误问题
wei.peng 06927ff370 Merge remote-tracking branch 'origin/dev' into dev
amy 8ad39b7c12 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 10939f8087 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
# Conflicts:
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	pom.xml
Silliter 068978f052 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
# Conflicts:
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	pom.xml
Silliter 7b98b02419 Merge remote-tracking branch 'origin/dev' into dev
Silliter 2a451b36a7 合并代码测试
amy d3e0c18d78 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy 263384eaaa 提交
wei.peng 7ba903a430 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-wms into test 
# Conflicts:
#	modules/i3plus-wms-api/pom.xml
#	modules/i3plus-wms-apiservice/pom.xml
#	pom.xml
amy 8b3434b27c 。。
yunhao.wang 8e25a0c437 单号规则管理excel导入导出
wei.peng 9eb7122e99 发布 正式版本 1.0
wei.peng e0f3118296 发布 正式版本 1.0
yunhao.wang cb95d0a713 项目pom版本更新为test
yunhao.wang 236dbc4f66 项目pom版本更新为dev
yunhao.wang 336e2f2901 Merge remote-tracking branch 'origin/master'
yunhao.wang 680c22e1f1 Excel导入导出
amy a3861b194d modify
柯裕 c95830289a 解决冲突
柯裕 70e1c259e2 优化库存移动单
jimmy 787501c59c 提交代码
Silliter d87eedb285 优化代码
amy 00061db0ca Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 398de72b6c 内部移库单实体字段添加
Silliter 3f5dcf9627 Merge remote-tracking branch 'origin/master'
Silliter ca78fb48fc 优化代码
gragon.xu a23fe003ae Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 660db622a8 组件实体类去掉调用方法属性
Silliter dbdd7834f1 Merge remote-tracking branch 'origin/master'
Silliter 1b54063b56 优化代码
jimmy 4bda89ee5b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 950303231f 提交代码
Silliter a7a39d7016 优化代码
Silliter 06d801be01 优化代码
yunhao.wang 7c37ce05a7 transient 替换为 @Transien
yunhao.wang 838f500156 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
yunhao.wang d7b4b1f7ab transient 替换为 @Transien
jimmy 707d54cc1c 提交代码
amy 63341ac734 Merge remote-tracking branch 'origin/master'
amy 7706f19445 抽点model创建
wei.peng 6683c2bdc1 Merge remote-tracking branch 'origin/master'
wei.peng 5398a45033 Sonar Test
柯裕 ca92b5caed Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
柯裕 7982a4fdc1 存储区查询条件优化
Silliter e45e68824f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 800c77cf1d 解决冲突
jessica.chen af863ec5a1 更改质检枚举信息
wei.peng 54d5d84a6b 用户管理优化
柯裕 41ecb414c1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
柯裕 23e538a5a7 作业任务条件模糊查询
gragon.xu 4b5b6136d7 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu b158c70e60 流程管家v1
yunhao.wang e92db6fd26 Merge remote-tracking branch 'origin/master'
yunhao.wang 203bfcb231 double非空判断
Silliter 62ab7105e8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 3b61edb7ab 解决冲突
gragon.xu f66854eb42 dao
gragon.xu 6ab4674a3b 冲突
gragon.xu d2672e33d4 冲突
gragon.xu 805ada2d1f 流程管家create
Silliter 4e44cdad24 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 11278ac43a 解决冲突
amy e8d25fc375 抽点比例添加工厂
Silliter 55093f22d7 解决冲突
Silliter ab9a0aae5d 解决冲突
柯裕 92b1caa276 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
柯裕 05d0995463 set改为List
amy b782ea1d12 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy f9537daabf 查询语句
wei.peng 85e31cdc02 Merge remote-tracking branch 'origin/master'
wei.peng de979cfac6 登录功能优化
yunhao.wang 9871e4d8c2 Merge remote-tracking branch 'origin/master'
yunhao.wang d5bbf84965 hql日期封装
Silliter 3a97a25b4e Merge remote-tracking branch 'origin/master'
Silliter ac84f62e70 解决冲突
amy d616af3a00 检查抽点
Silliter 4042461041 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 62dcedc133 解决冲突
柯裕 e3a8fb7b12 修改字段
wei.peng d039586e05 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng ad67318f27 添加常量 
工具类代码优化
账号状态注释部分代码
wei.peng 7f5470c34a 查询优化
yunhao.wang 265c4f0afa Merge remote-tracking branch 'origin/master'
yunhao.wang 0aac978b99 字典管理优化
Silliter d2847f60ba Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter cb395f077e 解决冲突
jessica.chen b43ffb6fc3 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen 69f4a95394 实体类已收数量添加
Silliter 61b16569a4 解决冲突
Silliter e1d0e75c74 解决冲突
Silliter d5f04e2a30 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 8e6bc17a45 解决冲突
jessica.chen beafe050ba Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen c92d9e98e4 枚举修改
amy 256c2acd41 条码类型枚举添加
jessica.chen b2e4c2496a 解决冲突
gragon.xu 7a8baf42d7 冲突
gragon.xu cd777e00a5 流程管家create
jimmy 7b8a6aafaf Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 76af709841 增加枚举
Silliter b0aca765ed Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 9dd0392bc0 解决冲突
alwaysfrin 7e48019386 微服调用调整
Silliter be70acde35 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 506f13d4b2 解决冲突
wei.peng 84446f9f68 Merge remote-tracking branch 'origin/master'
wei.peng 2753f64b7e 功能代码优化
Silliter e1c02277b3 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter bfc1d5ba2b 解决冲突
alwaysfrin 2779046bf8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin 52d4a995d4 spring gateway添加 
细节调整
amy d2a3f4a9bf 返回实体代码字段添加
amy 4d8148ea9d 返回实体构造添加
jessica.chen 08976004f8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen 8bc9984e4e 组件中PO条码表中状态枚举
Silliter fd83bef49b 解决冲突
Silliter 36c6d61e02 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter b77406b1e0 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms 
# Conflicts:
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/components/ScanOrderNoService.java
wei.peng bb9f6b28ce Merge remote-tracking branch 'origin/master'
wei.peng 804008410e 功能代码优化
Silliter 0dbb07ea9d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter b0d191ceaa 解决冲突
柯裕 4337055898 PO条码表
Silliter 43ed6deb6c 解决冲突
Silliter 442ec7cb5f 解决冲突
Silliter b97382f18e 解决冲突
Silliter 95826a1846 优化代码逻辑
jessica.chen 29bc20bce7 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen e67151271b 组件中单据类型枚举新增
amy fca1984860 返回实体代码字段添加
jessica.chen 83de8099bc 作业参数
jessica.chen 8553764df1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen fce89348c7 作业参数
amy c9dd7ba3cb 参数类型枚举添加
amy 1deba1c026 实体id序列化
amy 6178a4ce87 联合查询字段添加
柯裕 64c42217d4 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
柯裕 15aae342ee 作业记录明细字段完善
gragon.xu 7978b37bd4 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 0a0bafca8c 作业步骤组件；参数测试；修改组件参数的amID加上防止前端接收long型参数精数丢失；
amy 91e9252ed5 枚举添加
amy d2d4171e14 枚举添加
jimmy ba154986ea Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy efa5da8667 开发作业步骤调用
gragon.xu 69c2961bdc 冲突
gragon.xu c1e1a87333 一次性加载枚举
yunhao.wang 1e6e10e82c Merge remote-tracking branch 'origin/master'
yunhao.wang 571b3043ac Merge remote-tracking branch 'origin/master'
jessica.chen ae7c00576a 作业参数添加枚举状态
yunhao.wang 6cab7b9d09 用户消息 
websocket
gragon.xu 9ad28091fa Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy df478b5ff5 枚举添加
gragon.xu baed76597f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 7154172d3b test
amy fa54afe122 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 0c568f2107 添加查询条件
柯裕 7035bdd80c 作业记录，作业记录明细
jimmy 4ca1d70e0c 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
jimmy 911e93429e 修改抽点比例查询条件
jessica.chen fce4518982 解决冲突
jessica.chen 4b410c1408 新增作业步骤调用参数信息和作业记录参数信息
amy 0fe5c32fdc Merge remote-tracking branch 'origin/master'
amy 103a27c36e 作业流程与明细开发
yunhao.wang e0eb81177d 定时任务 
单号生成规则
wei.peng 1e6693db10 Merge remote-tracking branch 'origin/master'
wei.peng 4e995eac9b 功能代码优化
Silliter f99d4e4dc6 修改测试环境数据库编码
amy 7b71b349a7 修改
amy 805545574a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng b93609e655 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng 5dbf1bb2e8 自动填充信息Bug 修复
gragon.xu 205b4701aa Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 6977e11090 bug
jimmy 351aaf732c Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 37c8e3e212 开发作业步骤调用
amy 20152e7efd Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 1eb12350b2 時間
jessica.chen 41b0855f5d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen c2d8a35df6 更改物流路线信息
Silliter e2ebcd9430 修改测试环境数据库编码
Silliter 377f5d6194 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 9c1466fdca 修改测试环境数据库编码
jimmy cdde15c1bc Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 9fefeffdb7 开发作业步骤调用
gragon.xu 8f969353a6 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
gragon.xu da4665b0d7 作业步骤处理组件，参数实体，dao,sqlPack
jimmy 42831bcff6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy e5c5e80d41 开发作业步骤调用
Silliter 47bb3d6f7a 修改测试环境数据库编码
Silliter dc634e860f 修改测试环境数据库编码
jimmy fe5996b792 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 29c28271b3 开发作业
wei.peng ada91e5947 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang f248586360 Merge remote-tracking branch 'origin/master'
yunhao.wang 4229601ddb 消息管理封装
wei.peng f08b2098fd Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
柯裕 cbee340fbc Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
柯裕 43ebe4be72 修改条件数据类型匹配
wei.peng 605a438afc Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang e7f756efa7 Merge remote-tracking branch 'origin/master'
yunhao.wang 0400daa0f8 消息队列调整 
系统参数管理
数据初始化文件
wei.peng 372d916d0f 异常处理优化
alwaysfrin 0d8de0a632 Merge remote-tracking branch 'origin/master'
alwaysfrin 48f47956a2 基础对象调整
Silliter 356a238369 修改测试环境数据库编码
alwaysfrin 24df1f406a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin ffcd496e4e 微服优化，pom调整
amy a1ea518108 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 2374663655 ASN订单明细查询条件初始化
yunhao.wang c25fa2563d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang 9ee31a5113 单号生成规则 
邮件配置信息来源改为系统配置信息
wei.peng 8cd809c86a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng 855d9abef8 1、复杂树 功能完成
amy f7172d63ab ASN订单明细查询条件初始化
Silliter e9e7d37fa7 修改测试环境数据库编码
Silliter 56b823d11d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter bff458438b 项目结构调整
wei.peng 9a94061e5b Merge remote-tracking branch 'origin/master'
wei.peng 539afe3243 1、用户信息结构调整
amy 31cdce0f85 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 02c8790b4c 库存移动行号类型修改
yunhao.wang e88728f712 Merge remote-tracking branch 'origin/master'
yunhao.wang f0cb40891f 系统资源 批量添加
jimmy 719899898f 添加是否库位查询条件
yunhao.wang b2ba05e817 Merge remote-tracking branch 'origin/master'
yunhao.wang 4421ab69ef Merge branch 'master' of http://git.estsh.com/i3-IMPP/impp-framework 
# Conflicts:
#	modules/impp-framework-boot/src/main/java/cn/estsh/impp/framework/boot/aspect/LogServiceAspect.java
jessica.chen b79ed3bae2 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 5d4cb12c6c Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 2066bee025 单元测试
jimmy 9cda18eb32 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy e5567ce4eb 修改代码
jessica.chen 0d87b466eb Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen a3d7e3426c 更改模块
gragon.xu 690d9ef408 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu b3faaf50f4 库存交易前后端以及(11月19日)所有的小bug
alwaysfrin 4aa58b943d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin 0e5a97f783 微服优化，pom调整
yunhao.wang 963c01c93b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang 80d6c1a4aa 操作日志添加属性
wei.peng 470dbb015e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng ef85c84e68 1、BaseRepositoryImpl 根据ID 查询Bug 修复 
2、更新字段名,更新对象名称
Silliter 8d00fe7779 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 1cd4f356fd 项目结构调整
frin.fei 80962cf2b3 初始化服务注册中心icloud center service
frin.fei 86809c2027 Merge remote-tracking branch 'origin/master'
frin.fei 9867152278 微服调整
jessica.chen 145182f2da 更改模块
jessica.chen 9b529bf438 更改模块
amy ccdfc19aff 库存移动单状态枚举添加
amy 8841e18a4d 库存移动单
amy 25a1f215f8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy fecbfe821e 库存订单实体字段修改
jimmy b2d19f7cbf 合并sql
jimmy 64ea8f7fab 开发盘点主表、盘点冻结表、盘点实盘表
jessica.chen c5109d7e93 解决冲突
jessica.chen c332718ffb 更改模块且新增模块
amy 2aed8cfa1d 库存移动单
amy 2f991db5de 合并
amy 21a79af65a 合并
Silliter 71c78ec2b4 项目结构调整
gragon.xu 074b861035 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 87def59c4d 库存，库存条码，库存交易信息，库存交易条码V1
amy 9e340835ad Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 1dba2e2011 字段信息查找修改
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
gragon.xu 12392de1a4 库存，库存条码，库存交易信息，库存交易条码V1
Silliter 9498b3e2dc 项目结构调整
Silliter 46beafb09e 项目结构调整
Silliter 13f9849d8e 项目结构调整
Silliter 62b5dec0d6 项目结构调整
柯裕 8dc237f9d4 解决冲突
柯裕 f68378ba48 盘点子表
Silliter 1917c01c09 项目结构调整
柯裕 0634674c83 解决冲突
柯裕 c87c038410 meiju
Silliter 7e25f836c4 项目结构调整
Silliter 4c4edda8dd 项目结构调整
gragon.xu 7b8a5a2046 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu fe92584fa8 开窗
jimmy 519e945f5e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 7bc674d027 修改字段
jessica.chen b7b2b8df39 Merge remote-tracking branch 'origin/master'
gragon.xu 3fdeb69eee dragon
jessica.chen 108188b6f7 更改模块
wei.peng dec260e3ca 代码优化
yunhao.wang c92dede629 邮件消息队列调整
yunhao.wang 4303d11fa5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang 1b76c95b7a 站内信 全部完成
amy 8798674795 Merge remote-tracking branch 'origin/master'
jessica.chen 3da0022d64 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy aa506869cd 字段信息查找修改
gragon.xu 10da7ff5bc Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 6f524abe28 枚举
jessica.chen 5e9467cd35 更改模块
Silliter fb6335ec79 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 4aadf5adf7 单元测试开发工具类新增
gragon.xu 3c1d015653 移库单菜单权限提交
yunhao.wang f8e6e35009 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang 47901856d2 消息变更
jessica.chen 6548fdb446 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen 73b35ee0aa 更改模块
wei.peng 36ebab9f11 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen de35193b12 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter eb8795e1a6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter d5b71f274f 单元测试开发工具类新增
jessica.chen 8ff7e6b215 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen fb1756198d 更改模块
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
jimmy be354e6dd3 增加枚举
wei.peng d1e12bd498 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng 19e107984e 动态功能权限 功能完成
amy 8ab93eb53a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 40b536aa8e 初始化修改
柯裕 4ebe75e66c 新建枚举
柯裕 bd282d875f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy b81e502101 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 2995a1e057 修改查询条件
柯裕 0cc642f9b6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 0c7eac9025 单元测试开发工具类新增
amy c82ba74e9e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 88429e342e 枚举修改
frin.fei 3a34cfbd6b eureka、feign整合
frin.fei d4f6f639d5 eureka、feign整合
柯裕 19c635e8b2 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
frin.fei f07489d04d eureka、feign整合
gragon.xu 675e3abb6f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
柯裕 eb2ac7a408 修改查询条件
yunhao.wang 7cf1bb0d23 Merge remote-tracking branch 'origin/master'
yunhao.wang 4fb5f548cf 定时任务 完成 
表达式   完成
邮件工具类
jimmy b4735f3469 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
jimmy 611fb5b601 修改有效性等等
Silliter 3c32f511a7 单元测试开发工具类新增
gragon.xu e6775e65f6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 9189ca1bbd 前端调整
wei.peng fb2de0496d 用户图像功能完成
jessica.chen 15f1df839b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
柯裕 c66edabb7f 修改查询条件
jessica.chen aa23a3973f 修改抽点记录信息和产品发运信息
amy 90dda577fb Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy d4929181c7 删除标识枚举更改
gragon.xu 7cd7712912 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
gragon.xu 766318f1dc Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu d4fa40ed79 controller&service合并
Silliter 29f4de0a8e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 014a296bcd 移动抽点比例信息
jessica.chen 92f58a0162 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen 538ecf84c3 修改拼接
Silliter c2746e4a84 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu 762d7d4cc0 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
gragon.xu db8e869674 测试
jimmy 1cd7f42ed5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy cf32b4c92a 修改PO订单明细表sql
Silliter d49a2661cf Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter f677400273 单元测试开发工具类新增
yunhao.wang 4f246cb310 Merge remote-tracking branch 'origin/master'
yunhao.wang 5231aa7a6c 定时任务 
任务执行策略
wei.peng 30683429a9 添加账号查询条件
frin.fei 6a9ecc9543 Merge remote-tracking branch 'origin/master'
frin.fei b77fc7f291 微服调整
wei.peng 2e8e2895c7 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang 67a45fa7ac Merge remote-tracking branch 'origin/master'
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

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

定时任务 全部完成
yunhao.wang 3cfcb84f50 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang 830d481672 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
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  日期非空校验 调整
wei.peng 1750c725c6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng 4672bff2f8 Base Bean Bug 修改 
关系表添加构造函数
jessica.chen 072d64859c Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen 3c646ff823 建立库存表实体类
jimmy 43d8ad8fbc 修改库存交易规则
柯裕 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
柯裕 10520504f0 解决# Conflicts: 
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
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
柯裕 80b41620b1 元数据按钮实体及数据库接口
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
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
jimmy d7bf68d5ca 库存交易规则
Administrator f7e750e3cb wms通用数据信息与字段实体增删改查
alwaysfrin dc0c0b0058 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin d7b7501d19 mongodb工具方法，日志部分使用mongo
jimmy da9b042cf0 修改库存交易规则
jimmy 26f30ec92b 修改库存交易规则
jimmy 468ab162a5 修改库存交易规则
jimmy e36c33969f 开发库存交易规则
Administrator cc497e8a02 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Administrator 7479104bb9 接口驱动类
jimmy e95c145bc5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy c398e5f11c 开发交易规则
wei.peng f969257dea Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng 978bb1e8be 异常信息 添加 USER_LOGIN_NAME_EXCEPTION
yunhao.wang aa2c766d85 Merge remote-tracking branch 'origin/master'
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
wei.peng 5335cf3b44 Merge remote-tracking branch 'origin/master'
wei.peng f824f73733 HQL 别名o 改为 model
Administrator b8f3332887 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Administrator 4cf396419d 通用接口模块开发
Silliter cdfa9f9822 wms工厂仓库类书写
Silliter 433ac603fc wms工厂仓库类书写
alwaysfrin 9ea6567876 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin 3b0d13dca2 mongodb整合，功能优化调整
yunhao.wang c055bae070 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang c23c091e86 硬件类型 批量删除 
硬件管理     分页，排序
字典         列表查询
wei.peng 6ca53e59db Merge remote-tracking branch 'origin/master'
wei.peng 9bac06edae 组织管理功能完成
Silliter e7f77d19c9 wms工厂仓库类书写
Silliter 3f6da227e1 wms工厂仓库类书写
Silliter c686d32853 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 96fcb8ab4e wms工厂仓库类书写
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
yunhao.wang 888966732b 系统参数管理 复杂查询，分页，排序 
字典管理     复杂查询，分页，排序
硬件类型     复杂查询，分页，排序
分页插件     开始行错误bug
wei.peng 4061d60660 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng ffb0d1fd83 添加 岗位Tree 
添加 部门Tree
添加 组织Tree
添加 功能Tree
wei.peng 44ea78b93a 添加批量删除 
添加批量修改
alwaysfrin 1d106c9e59 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin 36f6c79e66 国家化处理
yunhao.wang e853dd63e4 count方法类型装换，long强转为int
yunhao.wang 8dbcbd17be 枚举字段整理
wei.peng 68b4778fd3 POJO 更新
wei.peng 06d7cf1c9f 用户权限 更新
yunhao.wang 9afe46a6b7 规范实体字段
alwaysfrin 75870afd36 跨域提交 
mq发送邮件
yunhao.wang 834d40d55e 硬件管理 完成 
硬件类型管理 完成
yunhao.wang 11c12f32c3 系统消息冗余字段调整 
添加系统消息及硬件枚举信息
yunhao.wang bbc849b3d1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang 1c9295769c 添加枚举： 
操作日志（操作类型，操作终端）
  	消息（消息状态，消息类型）
  	-硬件（连接方式，数据类型，状态）
  	系统参数（参数类型）
wei.peng a1bdbd827f 添加用户枚举 
SQL BUG 修复
wei.peng f91d524cfe Array To String Bug 修复
wei.peng 703fa5158a 用户增删改功能开发
yunhao.wang b53b6e47be 岗位命名规范
yunhao.wang 796824442c 岗位批量操作
wei.peng 5584ec7ce5 定时任务 
定时任务表达式     功能完成
    定时任务           功能完成

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

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

权限
    用户管理           功能完成
    用户登录           功能完成
alwaysfrin b61d5cc0ba Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin 89b717b4dd ignore整理
wei.peng f20d8cab3d 定时任务 
定时任务表达式     功能完成
    定时任务           功能完成

权限
    用户管理           功能完成
    用户登录           功能完成
yunhao.wang 0606b5e982 修改实体内关联id类型为Long
yunhao.wang 8cb21b225a 解决冲突
yunhao.wang bce3b9f28c 部门，岗位实体NAME属性修改
wei.peng 73b4d3b9ac POJO 字段更新
wei.peng 9bdf8b90e6 添加 default example
wei.peng 724dd48cc1 删除target 文件夹 或者删除.iml 文件
wei.peng 028833d567 删除target 文件夹 或者删除.iml 文件
wei.peng 7b080b6a3a 删除target 文件夹 或者删除.iml 文件
wei.peng c2b3d3b5ba 删除target 文件夹 或者删除.iml 文件
wei.peng e37d23ecb9 删除target 文件夹 或者删除.iml 文件
wei.peng 1e37b8d50f 删除target 文件夹 或者删除.iml 文件
alwaysfrin bc83a59d3b ignore整理
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
alwaysfrin 883c31288b ignore整理
wei.peng 8eeb76507f 系统先跑起来
wei.peng cdb48374ac 移除iml文件的版本控制
wei.peng 9121cafcff 移除iml文件的版本控制
wei.peng 9361b16c0e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng 68d0142f67 权限、角色 实体更新
alwaysfrin 231efdcf13 ignore整理
alwaysfrin 40a7ef7e31 平台功能优化
alwaysfrin c9ce9035e5 国际化
alwaysfrin f6d209250f Merge remote-tracking branch 'origin/master'
alwaysfrin daf65deb32 国家化封装
wei.peng 6a9e2849ad POJO Commit
wei.peng 190f348f7d POJO Commit
wei.peng 9cd186e66f POJO Commit
alwaysfrin 336f808d58 主键Long型转换json时调整为String
alwaysfrin 39ea4fe7e8 Merge remote-tracking branch 'origin/master'
alwaysfrin 5f970b9308 shiro优化
wei.peng aaa0a1b21b 初始化系统配置
alwaysfrin 74483040b3 impp核心功能初始化
alwaysfrin a208e592bd 基础对象初始化