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

3066 Commits (ba5ddc09e1aba429397ec9ff45d4e0b68006fbc9)

Author SHA1 Message Date
peter.pan 5741bfa2e6 Merge branch 'test'
peter.pan 5bed1d27ec Merge branch 'dev' into test
陈思洁 79b36a30a4 冲突合并
陈思洁 fe3d392e9b 新增枚举信息 
移库单明细表冗余主表临时字段
新增物料表字段
peter.pan f3eb8d2356 Merge branch 'dev' into test
wei.peng 541b40d182 合并代码
peter.pan 53135c27f5 Merge branch 'test'
peter.pan b39d7038fa Merge branch 'dev' into test
许心洁 dec3743911 流程管家推队列查询条件没有封装
wei.peng 2cbc082c7b 动态对象 空数据处理
peter.pan eeefb843b4 Merge branch 'test'
peter.pan 37b8755485 Merge branch 'dev' into test
汪云昊 d3deaa6081 安灯bug解决 
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
许心洁 e43c493463 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
许心洁 994da92b4e 交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG
peter.pan c02d22ecba Merge branch 'test'
peter.pan b18d393fe0 Merge branch 'dev' into test
peter.pan e95db40c23 123
peter.pan 543171dfbb Merge branch 'dev' into test
wei.peng 1ac5542541 动态表单分页功能完成
peter.pan c436c8ee3d Merge branch 'test'
peter.pan e3354f52bd Merge branch 'dev' into test
陈思洁 92daec97e3 枚举修改名字
peter.pan b8730fac47 Merge branch 'dev' into test
wei.peng ac5bf14d6b 动态表单动态操作　功能优化
许心洁 15386ae5c2 枚举
peter.pan 628f1db31c Merge branch 'dev' into test
汪云昊 ff9a5dcd17 Merge remote-tracking branch 'origin/dev' into dev
汪云昊 98de08ba4a 文件上传优化 
字段删除异常
日志添加索引
peter.pan 96264870c2 Merge branch 'dev' into test
许心洁 efbe9dac9e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
许心洁 bf02cbf8a4 PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
peter.pan 99710d5c20 Merge branch 'test'
peter.pan 9c38ed702a Merge branch 'dev' into test
刘敏 97adebba21 枚举新增 实体字段新增
peter.pan 3b1d19bbab Merge branch 'dev' into test
陈思洁 a8dee4713a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 31f6f4deef 枚举字段新增AMP 
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
刘敏 1b569ff3a8 ERP同步标识枚举添加
peter.pan f4bf536296 Merge branch 'test'
wei.peng ee5a4f1dfe Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng 0962b810ce Json 转换精度丢失
wei.peng 5d2695a5cb Merge remote-tracking branch 'remotes/origin/dev' into test
peter.pan a551249165 Merge branch 'dev' into test
wei.peng 2e5b7466c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 1b4e5143aa 用户单帐号多平台登录
许心洁 364efedc42 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
许心洁 c783d9119c 任务列表查询查出了状态为30的任务+流程处理组件execute方法提升事务级别+枚举添加根据枚举名查找枚举详情的静态方法
peter.pan d39c16c5d5 Merge branch 'test'
peter.pan 49d35f264e Merge branch 'dev' into test
于学杰 35f92b05e3 1. 修改ERP接口暂存表的字段，增加关联单据类型
wei.peng 1ee9cb24f2 Merge remote-tracking branch 'remotes/origin/dev' into test
peter.pan 7861048e31 Merge branch 'test'
陈思洁 2ce560b39f 生产报工明细实体修改和枚举新增
jenkins 470d319504 Merge branch 'dev' into test
sky.meng 3cc4aec00a 库存预警看板
sky.meng 2f1a3080ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
sky.meng 05c56e46b4 库存预警看板开发
peter.pan 176f9ffd5f Merge branch 'test'
于学杰 713503d7ff Merge branch 'dev' into test
于学杰 5d1447c92a 1. 解决标准拣货多级存储区查找的问题
许心洁 41324abdad Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
sky.meng 854ee5b3cf 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
sky.meng 0f3d67d110 供应商收货看板功能完成
许心洁 8347085f26 冲突
许心洁 e3d5e5bb19 PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
wei.peng eb2f61c32f Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
汪云昊 4309454d2a 邮件异常提示优化 
EXCEL数据通用导出
wei.peng f32f7e72a2 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
shiyanghuan f3151cbbe3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
shiyanghuan e13d4163b7 库存交易报表代码提交
wei.peng a4016dc911 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
刘敏 34dcf6d526 枚举修改
wei.peng 33ec897657 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng 734340fe63 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
许心洁 7b83985f40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
许心洁 f6bf244b12 流程管家放MOVENO的BUG
汪云昊 6259bd56bc 通用EXCEl导出MODEL
jenkins 320910e2ae Merge remote-tracking branch 'origin/dev' into test
许心洁 dfef27151d 冲突
许心洁 f834e91353 Task#764+枚举TRUE_OR_FALSE
jenkins 32cc1db3bf Merge remote-tracking branch 'origin/dev' into test
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
peter.pan ea83820fbf 新增物料类型跟单位类型
许心洁 b3272dc3d7 冲突
许心洁 fe13a43ccc WmsEnumUtil冲突（几步法）
jenkins ea4cde868f Merge remote-tracking branch 'origin/dev' into test
陈思洁 fb98db0bcc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 c08a569ac5 sql优化 
数据权限实体增加字段
枚举增加数据权限的交易对象
刘敏 7d0cd674cf 零星退料指令导入开发
许心洁 79d1da3230 系统数据初始化
wei.peng bec3a7098d Merge remote-tracking branch 'remotes/origin/test'
jenkins 16bb8d6714 Merge remote-tracking branch 'origin/dev' into test
汪云昊 8e41b40196 excel工具类优化
jenkins 884d4fd763 Merge remote-tracking branch 'origin/dev' into test
汪云昊 21746dc440 excel工具类优化
汪云昊 163cb6240e Merge remote-tracking branch 'remotes/origin/dev' into test
汪云昊 31c347275c 添加重要度枚举
jenkins ac8b9d3986 Merge remote-tracking branch 'origin/dev' into test
wei.peng b7a7eb29ae 安灯类型 查 表 已从表改为枚举 
安灯动作		查询				表		  已从表改为枚举
安灯状态		 查询						   已从表改为枚举		ANDON_STATUS
通知方式		 查询						   已从表改为枚举
重要度			  查							已从表改为枚举
jenkins 68fadff818 Merge remote-tracking branch 'origin/dev' into test
wei.peng 2adff745fb 自定义表单　功能优化
wei.peng 0fb7e05e88 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
alwaysfrin 10c276fb16 自定义数据源
jenkins 511df468ec Merge remote-tracking branch 'origin/dev' into test
wei.peng 13af329513 动态查询Cloud 服务基础功能已完成 1.0
jenkins a58888df85 Merge remote-tracking branch 'origin/dev' into test
wei.peng c4dceace92 增加动态报表对外接口-批量修改
jenkins 878108e86f Merge remote-tracking branch 'origin/dev' into test
wei.peng f2b19055d4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 3630f0c2f1 动态查询Cloud 服务基础功能已完成
jenkins 0e70ff103a Merge remote-tracking branch 'origin/dev' into test
刘敏 94166da1ec 条码状态修改
汪云昊 c07858d5ba Merge remote-tracking branch 'remotes/origin/dev' into test
刘敏 a5caf4eab5 供应商退货枚举新增
陈思洁 727c1efea8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 507902473c 新增业务类型枚举
刘敏 b0faa179d1 报废状态从条码状态移入到质量状态中
jenkins 1a7cda72d3 Merge remote-tracking branch 'origin/dev' into test
wei.peng 27e4fc8ec2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jenkins 28ae6cf85d Merge remote-tracking branch 'origin/dev' into test
wei.peng aec4b9a85a 自定义表单 多数据源 功能完成
Silliter a39ce52aa9 呼叫升级和响应升级优化
汪云昊 e2cfcc4c5f Merge remote-tracking branch 'remotes/origin/dev' into test
汪云昊 8ea762e5df 细节优化
汪云昊 e514479f00 细节优化
allen.zhang 67e3851a86 Merge branch 'dev' into test
柯裕 10cc2ac052 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 d081c16c61 安灯类型，状态，子类型，基础数据开发
汪云昊 4cbc41a959 细节优化
柯裕 3cba9077fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 f1e8f07a90 新增需求：自处理
wei.peng 7ef2eb0c6e 报表 表单打通
allen.zhang f6d70a2781 Merge branch 'dev' into test
Silliter 1adcd23c6f 呼叫升级和响应升级优化
柯裕 47baf16e0f ANDON动作
allen.zhang d70f85d592 Merge branch 'dev' into test
Silliter 9c5aab7215 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter c9243ccad0 呼叫升级和响应升级优化
陈思洁 e33c7c2465 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 8e7b3d61e7 枚举修改
Silliter 27b32626b3 开发主动升级和启动产线业务
crish 701430066e 事务管理 
Signed-off-by: crish <570360737@qq.com>
Silliter ba3064d27d Merge remote-tracking branch 'remotes/origin/dev' into test
crish 3a7aace277 Merge remote-tracking branch 'origin/dev' into dev
wei.peng 5ba134126a Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
crish 1efd33975d 生产队列，生产计划，生产工单优化和bug修复 
Signed-off-by: crish <570360737@qq.com>
Silliter 8a298687c2 开发andon呼叫停止产线
Silliter 9eb6e82306 开发andon呼叫停止产线
jenkins fef940bcda Merge remote-tracking branch 'origin/dev' into test
jiajack c8a9edab64 质量判定业务修改
allen.zhang d714733a27 Merge branch 'dev' into test
曾贞一 4e45f813dc CS_ORDER_STATUS 枚举修改 
DdlPreparedPack getNotInPack getNotInPackString 方法修改
许心洁 9200080178 MES-POJO添加产品配置名称，产品类型名称作为冗余字段
allen.zhang e24e7ef421 Merge branch 'dev' into test
Silliter a42bb71aee docker配置文件修改
allen.zhang 440083b5f2 Merge branch 'dev' into test
alwaysfrin 65b5ac3803 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin cc02090910 事务调整及demo
Silliter 630ad20587 开发安灯呼叫升级定时任务
jenkins 21d3c053ca Merge remote-tracking branch 'origin/dev' into test
许心洁 b5696a63f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
许心洁 e79987d235 MES流程配置接口（流程，产品流程配置）
jenkins a7833ea9dd Merge remote-tracking branch 'origin/dev' into test
刘敏 b90139312c 条码管控枚举添加
yiming.gu 2eb732c7df Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
yiming.gu 7c647c7844 1、班次pojo修改 
2、andon项目新增组织模型基础数据
柯裕 c1bf54f9c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 5a3e2996c7 findMaxByProperties更新
jenkins 7c20f070e4 Merge remote-tracking branch 'origin/dev' into test
crish 8c443c3afb Merge remote-tracking branch 'origin/dev' into dev
crish d6221c39ae 生产模块bug修改 
Signed-off-by: crish <570360737@qq.com>
柯裕 72ac3490e4 ANDON枚举
allen.zhang 5f5b3b84bd Merge branch 'dev' into test
柯裕 4a84e1e8ca Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 95789ab615 ANDON实体枚举更新
yiming.gu 12e555e3a4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yiming.gu c7e5fc732e mes组织模型菜单等级枚举修改
柯裕 56e17f62e9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 593a062e9f ANDON枚举
yiming.gu 494fc4aa70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yiming.gu 486dda639f pcn队列pojo vin字段改为string型
柯裕 8ccc265f0d ANDON枚举更新
Silliter c9c470a27f 开发物理安灯业务
Silliter 47bd2c0aa7 安灯项目开发
jenkins 298a3c1ddf Merge remote-tracking branch 'origin/dev' into test
许心洁 4cf5fbc2b7 #4091+流程配置复制流程+作业步骤参数，作业组件，作业组件参数，作业流程基础数据接口代码调整
yunhao.wang 6ebc22e6cc master分支配置调整
yunhao.wang 58247fe3f1 清除iml
Silliter 4e9a8ab787 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin f343ea865c 安灯和硬件适配初始化
Silliter 0a36f9130f Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter b2c5494983 联调系统配置接口
wei.peng 8e2bf96a14 找回丢失代码
jenkins 12e2f1d1b8 Merge remote-tracking branch 'origin/dev' into test
许心洁 85a44b1baa Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
许心洁 19f30ce4f9 流程配置+定时处理错误移动单给错误信息赋值过长
jenkins 0c7b87bf24 Merge remote-tracking branch 'origin/dev' into test
jiajack d6c7e39989 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jiajack 038484e7ac 工步调度业务完善
yunhao.wang 099a58a14d Merge remote-tracking branch 'origin/dev' into dev
yunhao.wang 7e8730ea9f 自定义按钮功能接口 
消息优化
Silliter f8b89c930b Merge remote-tracking branch 'remotes/origin/dev' into test
yiming.gu a1a63c2247 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yiming.gu feace14920 PCN同步MES主数据
jenkins 850b372ab4 Merge remote-tracking branch 'origin/dev' into test
alwaysfrin cb628b0125 事务持久化调整
jenkins ed474fe112 Merge remote-tracking branch 'origin/dev' into test
Silliter b3f4ccbb78 自定义脚本开发
Silliter c8c8dc6750 Merge remote-tracking branch 'remotes/origin/dev' into test
yihang.lv b76ccb43d2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yihang.lv 7da6627878 sweb通知公告
crish 82de566e90 封装字符串>= <=查询 
Signed-off-by: crish <570360737@qq.com>
jenkins 4a5d0f0cb3 Merge remote-tracking branch 'origin/dev' into test
yihang.lv cdd0e5fc05 消息接口修改
Silliter 3d56e2539d 合并dev代码
yunhao.wang 950c6dee36 附件来源
yunhao.wang eee0539562 sweb公告处理
jenkins 0cde3d8a63 Merge remote-tracking branch 'origin/dev' into test
Silliter 89d6ef61f4 盘点加
jenkins fb4be4580d Merge remote-tracking branch 'origin/dev' into test
gragon.xu 186a9ccb0d 监控台
Silliter 83ce4f0efb Merge remote-tracking branch 'remotes/origin/dev' into test
crish a62ead1c25 Mes生产计划，生产工单
wei.peng ef109e185d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng c119c06130 自定义表单 使用Redis 1.0 功能完成
jenkins df63afecf8 Merge remote-tracking branch 'origin/dev' into test
Silliter 8a69224e05 优化入库和质检明细处理业务
gragon.xu 311eaf979a Merge remote-tracking branch 'remotes/origin/dev' into test
crish e5e0c05b9f Mes生产计划开发
Silliter 28e43c087b 合并dev分支代码
wei.peng 97e992f05f 自定义表单拦截器开发1.1完成 
优化动态表单页面接口
gragon.xu cd1c135594 交易处理组件isPart!=isSnControl（新增枚举取反方法）+库位新增默认状态为“空库位”
yihang.lv 50f0a7d52a 新增逻辑修改
yihang.lv 1a583f7ebb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yihang.lv ce55dda367 确认订单目录调整
Silliter 6cb456fcc4 Merge remote-tracking branch 'remotes/origin/dev' into test
crish b2efdd2496 Merge remote-tracking branch 'origin/dev' into dev
crish ab1e524f20 MES生产计划枚举
Silliter 1896472e63 Merge remote-tracking branch 'remotes/origin/dev' into test
gragon.xu 01a5cb287b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu e20d212991 IS_GENERAL_TASK加上Code+DATA_STATUSCode值改为TRUE和FALSE
Silliter 0181b0ecab Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 9418373b4d DdlPack，封装bug
crish 8678d9961e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
crish e161894239 Mes生产计划枚举类
Silliter 65b388d048 合并dev分支代码
wei.peng af8f8884a2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 120ea87da8 动态接口集成 Bug修复
Silliter f509514233 Merge remote-tracking branch 'remotes/origin/dev' into test
crish 4d9b1efb69 MES 生产计划枚举
Silliter ac52608e22 Merge remote-tracking branch 'remotes/origin/dev' into test
yihang.lv a464028a3b 新增初始化
yunhao.wang 9c54bc6f9d Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 6960275e3b DdlPack，日期封装bug
alwaysfrin 64350cce31 DdlPack，日期封装bug
Silliter df714efc3b Merge remote-tracking branch 'remotes/origin/dev' into test
jessica.chen 887121580b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jessica.chen 8e5a26bc63 修改是否指定条码枚举
wei.peng 15901e3fe1 自定义表单拦截器开发1.0完成
Silliter d885d6b877 Merge remote-tracking branch 'remotes/origin/dev' into test
yihang.lv 63d0178cfd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yihang.lv 93f4d1cfd7 发布列表接口
alwaysfrin 19b78c4148 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin bec70bc79d DdlPack，数字equals添加大于0的约束
jiajack a7450b71fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jiajack 3980e05d2b mes新增通用功能可配置的业务-完善
alwaysfrin d0cac648f3 添加update通过DdlPack
alwaysfrin b80cda2439 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 0f637fe2f7 Merge remote-tracking branch 'remotes/origin/dev' into test
jimmy 58ec3e9323 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy a745015be7 移库单指定条码枚举
yihang.lv 542052815b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy 9dca4f2dbb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy eda257bf23 盘点PDA端，输入数量校验
yihang.lv 18c6a72b3e 订单类型枚举
yihang.lv bb2d5f905a ids改为idsStr
Silliter 4b440fc1f3 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 5a4c85e409 消息附件管理
Silliter 4c0116b082 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 6d8643da0c 权限分配调整接口 
消息调整添加微服务支持
添加sweb通知处理队列
yunhao.wang 1d9dd174e9 前端联调接口优化 
单号生成工具类bug解决
alwaysfrin 7f10c22613 部分细节调整
wei.peng d70eec3967 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yihang.lv 9802d19b2e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yihang.lv f1993e69c8 sweb目录调整
wei.peng 82d472466b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng cc3b1a741c 元素虚拟属性封装
jiajack 3a5f43f97b 删除iml文件
wei.peng f810e35873 自定义表单 数据操作接口 DAO 层优化
Silliter c90dca9b05 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 2df3b92103 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 9d047fa3e5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 1adc8e4baf 自定义表单 数据操作接口 DAO 层完成
Silliter a22492193e Merge remote-tracking branch 'remotes/origin/dev' into test
柯裕 152bcdf9ce 优化质检明细枚举
Silliter 7e0f4b031f Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang cb1b5f9fdb bug修复
wei.peng 5b0d4f8d37 元素增删改查 DAO层接口完成
gragon.xu 712ec2af7e 单据状态描述
alwaysfrin 1371f94838 熔断返回信息封装
Silliter e82f1fe49c Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 87aa6644fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 76cbc39fe1 新增自动填充null值属性
Silliter be9edbce54 Merge remote-tracking branch 'remotes/origin/dev' into test
柯裕 6f7258d49b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 edee3a7312 优化枚举
alwaysfrin fdb9e655c3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 6971fdbf60 删除json序列化not_empty限制
Silliter 3c5d6cadf9 Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter f0b666b502 优化
Silliter 9c7665d354 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 2830bd0376 hql封装优化
Silliter e61669dd98 Merge remote-tracking branch 'remotes/origin/dev' into test
gragon.xu fb78a04969 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu 863b7b0d61 移动单条码的行号不做为查询条件 
交易处理组件：出入移库：移动单明细可能没有关联单据，所以只能根据源库位类型和质量状态更新库存相应数量
jessica.chen 426b2e8952 质检枚举修改
alwaysfrin 7876ab6475 hql封装优化
jimmy 6755e5ade3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy 4ba121d7c9 架构修改基础方法
Silliter 36034d4925 查询优化
Silliter 261c9bea38 Merge remote-tracking branch 'remotes/origin/dev' into test
gragon.xu a7370f4cc0 调用获取单号
Silliter 92c5457521 Merge remote-tracking branch 'remotes/origin/dev' into test
gragon.xu 2b91b9a1d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu 59b086dc5d BaseBean.findByHqlWhere:查询别名代码错误 
WmsHqlPack:修改封装方法使用DdlHqlPack
任务合并代码错误
wei.peng d59318a024 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng ccce8c009c 级联功能接口完成
Silliter b9d013280f Merge remote-tracking branch 'remotes/origin/dev' into test
yihang.lv 87895eb194 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yihang.lv 709c018fb4 Sweb更新到订单明细修改历史记录查询
yunhao.wang cb6b06cb6a Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 97e0889971 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 4f0e3756df 优化调整
yunhao.wang faa8a0d1c7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 865add1f7f 按钮功能接口
Silliter ee1488d28e Merge remote-tracking branch 'remotes/origin/dev' into test
gragon.xu 6b8ac6240d LINK_ORDER_TYPE无需数值
Silliter e8deda24fe Merge remote-tracking branch 'remotes/origin/dev' into test
amy ecdd1d45de 是否散件枚举添加
Silliter fe644066af Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 244494d77b hql封装优化
wei.peng 04ed151d45 元素管理接口完成(未测试)
Silliter 38311760a1 Merge remote-tracking branch 'remotes/origin/dev' into test
jimmy cd00bdd954 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy 3c2a345b93 盘点pc端
wei.peng 93f4745afd Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
# Conflicts:
#	pom.xml
wei.peng 7190c8ff6f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 045c68ee2e 数据对象管理接口开发完成
柯裕 3d8b3983c3 优化枚举
gragon.xu ff4c50c5f1 枚举统一
gragon.xu 0ed4691114 枚举统一
gragon.xu 8b3b37260e 枚举统一
Silliter e8de83b696 Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter afa2ac746a 定时获取库存移动信息开发
Silliter dbeb965e9b Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng e4adb35413 自定义表单 数据对象 新增接口完成
wei.peng e4a3b95f16 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 1049a11576 自定义表单 数据对象 新增接口完成
jessica.chen c500681b5d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jessica.chen 00ee87f645 新增NC处理的操作类型枚举
wei.peng f039095f83 数据对象实体更新 
创建数据对象 Model
gragon.xu a8f3307237 定时任务循环记录异常
Silliter 2d6e3b5545 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 635cc27eb0 自定义表单布局接口 
自定义表单菜单接口
自定义表单功能接口
Silliter 111c6177c9 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 1897d227e6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin ea2eb6103d 优化调整
Silliter dd0af51d8f Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter 4aaa9bc03a 1.优化流程管家 
2.开发条码打印，订单打印，收货回执打印
wei.peng bfd99830b6 FindBugs 提示Bug 修改
Silliter 6396056d08 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 3ec56056d3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 1dcdf36537 添加mes、mes-pcn、sweb三个微服
wei.peng 01ee15e67a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 569e872ebc 自定义表单枚举添加
Jack.lv b9d00d181e 条码枚举
Silliter b1f195a185 Merge remote-tracking branch 'remotes/origin/dev' into test
gragon.xu 557f21bf6a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu bd6f6c0546 交易处理组件V2.0：库存交易表中数量类属性与库存表保持一致
Jack.lv 73d2da12ed po版本枚举
Silliter 2e020d7be2 修改枚举类
Silliter dcfb0f5cdf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 738db8d837 条码打印开发，角色微服务提供
jimmy f52b3ff189 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy 8da671628c 盘点PC
Silliter e1519f832f Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter 148d808129 枚举添加数据状态字段
Silliter 618ce5d560 Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter c4ef1e66f3 开发条码打印后端
wei.peng 8ec8dba414 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 7e9704db00 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin fd6552b4ac 定时任务封装
Silliter 9ee4956924 Merge remote-tracking branch 'remotes/origin/dev' into test
柯裕 2b848e18e0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 a495ea2fce 更新质检枚举
Silliter 6464cbd533 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin d62910737b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 5951d7fad8 schedule定时任务调整，fallback熔断机制改为factory模式
Jack.lv 20cea81ea2 初始化状态为新建 枚举新增
gragon.xu a4301ce4b2 redis.pusHashMap
gragon.xu 48161d95a1 枚举冲突
gragon.xu e7fa2f3abf NC,盘点交易处理组件
crish 249ca7f372 Merge remote-tracking branch 'origin/dev' into dev
crish 114816d483 删除多余枚举类
alwaysfrin 1c7d601922 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin c4a9a4ac1e 解决id重复问题
Silliter 62196df6bf Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter aa1b4ac805 定时获取库存移动信息开发
Silliter 142e2b47c9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 74b63d8a72 开发流程管家根据任务创建流程
alwaysfrin 550f15cb35 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 207b7ea7eb 解决id重复问题及shiro授权bug
Silliter 11a2a72917 枚举类加入禁用、启用、全部
Silliter 41a1cc46e8 枚举条码状态调整
Silliter de5760bba1 Merge remote-tracking branch 'remotes/origin/dev' into test
crish c0841bb89c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
crish 24b38fefb0 入库添加枚举类
gragon.xu 85d3463348 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu e1825eac40 交易处理组件ALL
Silliter d604b42c1d Merge remote-tracking branch 'origin/dev' into dev
Silliter e4600e1c01 定时获取库存移动信息开发
alwaysfrin ab63dadb1c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 8ac4046a7d 开发校验权限和获取个人任务列表公用方法
wei.peng 0a5c19ebe5 Merge remote-tracking branch 'remotes/origin/dev' into test
柯裕 d2190c55c7 解决冲突
柯裕 8edf27d389 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 9a6a9018cf 更新枚举
wei.peng 6835593401 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 03fe15e2f4 自定义报表优化
Silliter cc4484a562 Merge remote-tracking branch 'remotes/origin/dev' into test
gragon.xu 201f960d08 冲突
gragon.xu 31d91f48b3 收货交易处理组件开发
柯裕 398a3d98c5 更新POJO
Jack.lv ed7857b86d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Jack.lv b667d6840e 获取权限和根据权限获取任务列表
jimmy 89bd80ea21 Merge remote-tracking branch 'origin/dev' into dev
jimmy d41a4f0dc9 提交NC枚举
alwaysfrin 8967fd21e6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 576743ed18 自定义表单，动态对象工具
wei.peng 1e18495617 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 1bdc307a1b 自定义报表 折线图功能完成
yunhao.wang 62987c7d0f Merge remote-tracking branch 'origin/dev' into dev
柯裕 f25395ebd6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
柯裕 ce9cbe1198 更新pojo
Jack.lv 296db97c72 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Jack.lv 6c6710dd67 在途库位 枚举修改
yunhao.wang 54bc2fe482 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu 8822f4f22f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 5b6b720d7d 优化报表 
单号生成规则调整重置条件
wei.peng 4b4fb30248 自定义报表 饼图功能完成
gragon.xu 44148da43c comit
gragon.xu 0361d6bd79 业务类型统一存数字类型；关联单据类型统一存字符串类型
wei.peng 86a70e758b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 44676161ad 自定义模板优化 
echarts 工具新增
Silliter 6b419e11cb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
Silliter ba90dfb123 开发交易处理主程序
柯裕 933654a86a 增加库位状态枚举
gragon.xu d67d4fa929 SQLPACK冲突
gragon.xu 1aa8f7fd1a 任务处理程序
yunhao.wang 8e029e82e0 报表优化 
解决bug
邮件消息优化
Silliter 78ffcb9550 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 73181f1c1a WMS实体对象重构，枚举修改
yunhao.wang adfe3cb2e6 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang ba36cfecd5 报表优化 
国际化接口
yunhao.wang dedc7b45fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang b01e479cb3 报表优化 
impp压测接口优化
消息队列非空验证
单号管理增加状态
wei.peng 3fce943723 Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng a3e1381736 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 4c83a05d0f 自定义报表 获取目录接口功能完成
Silliter ebb4cc9f2e Merge remote-tracking branch 'origin/dev' into dev
Silliter bb0eda58f4 流程管家调整
yunhao.wang 02f95f0939 性能测试
yunhao.wang a68771db32 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 23450c0218 bug解决 
操作日志添加人员登录名称
yunhao.wang db8a4fbe6f 日志白名单
yunhao.wang b28cab255d Merge remote-tracking branch 'origin/dev' into dev
yunhao.wang 295d4c9ac9 报表布局 行高,列宽设置 
MongoDB id 映射处理
alwaysfrin 16daf7c1b9 修改了
wei.peng a2bbd4b5f0 Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng c61d0882c5 模板管理生成HTML 完成
wei.peng 42f00211c1 模板确认接口完成 
模板状态扭转功能完成
wei.peng 19a8189b05 模板管理 后台功能完成
wei.peng 2bd16137bd 模板管理 后台功能完成
yunhao.wang e35113c519 报表排版实体变更
wei.peng 1e43b2e36f 模板Pojo 调整
wei.peng dd9c35e6e1 模板Pojo 调整 
模板 枚举 添加
添加枚举接口
wei.peng c5f3897bc9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 7ccd5613b3 目录联调Bug 修复 
模板Pojo 创建
模板枚举定义
alwaysfrin cfbd536004 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin cb30fc88b2 添加了线程池和消息队列的交换机机制
yunhao.wang 504c3e871c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 42a38392fc 报表元素接口
wei.peng cb59664740 新增获取目录类型接口 
新增查询关联角色接口
枚举名称调整
yunhao.wang 69d385d6d5 报表元素
alwaysfrin d7aa0bda87 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 989ad48653 主键生成策略调整，日志部分调整
yunhao.wang 7d4f3ebb67 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 77296816e6 通用导出 
单号规则导入导出
系统参数添加组
yunhao.wang 0263ad0a90 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
yunhao.wang c4b0e3ba0e 解决bug 
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
wei.peng 79ad222295 用户密码加密侧率功能完成
Silliter c45091584c Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin b8a1196a45 添加自定义组件
Silliter dd11ff1e71 Merge remote-tracking branch 'remotes/origin/dev' into test
amy effa749d3f #
Silliter ff4812ae04 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 2498c50bfd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 47ebc8795a getSingleResult优化
Silliter 65fead254f Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 436f8ca139 解决bug
Silliter 180c8c230c Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 02e31b07c8 定时任务日志完成 
解决bug
wei.peng 8a8f3dbb57 Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng b3d7cb259e 组织管理父节点Bug 修复 
复杂查询添加默认排序
wei.peng e01d83adca Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 609c1557d3 bug解决
wei.peng 3f6b281912 发版 2018年12月28日
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 流程管家优化
Silliter a4d59caaeb Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter b55906ced0 生产领料优化
gragon.xu a5e05ef36e 修改流程管家在调组件之前对组件参数的过滤条件：组件参数类型为30的不用验证，组件名为prompt的不用验证
yunhao.wang ea621d14f8 定时任务修改
Silliter cc3bb9e9ae Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 6b06d3ff04 bug解决 
添加默认字典项
ics添加全局异常捕获
amy f456ff2f75 入库上架扫描条码
wei.peng 38be37aad0 Merge branch 'dev' into test
amy f2d7279e94 计算bug修改
jimmy a9ab449316 Merge remote-tracking branch 'origin/dev' into dev
jimmy 159892b64d 修改
amy e329c69aa5 公用计算方法修改
yunhao.wang 7b2d7f78dd Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng 79ee50684e Merge remote-tracking branch 'origin/dev' into dev
wei.peng 0988c1ad26 用户登录优化
yunhao.wang 126d829b41 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 62f601d287 Merge remote-tracking branch 'origin/dev' into dev
yunhao.wang 8cb5c2ee1a Merge remote-tracking branch 'remotes/origin/dev' into test
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序号
yunhao.wang 6821bb17cc 枚举名称统一
wei.peng ffb29d0d03 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng c221d618ea 登录日志功能完成
yunhao.wang bb289774d9 dashboard部分功能 
修复bug
alwaysfrin 4a89439b30 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin f775968194 扩展块功能
Silliter faf1c1318f Merge remote-tracking branch 'remotes/origin/dev' into test
amy 0429edfb61 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
amy b58b06f1a3 作业流程明细动作类型添加
wei.peng 47105866be 合并代码 解决冲突
yunhao.wang c6399fb209 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 4fe87c5ce2 解决bug
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 35ecf85881 冲突解决 合并代码
wei.peng 47dd4c68b5 配置文件修改 Test to dev
wei.peng d9214fd746 动态表单 基础功能完成
wei.peng 2ad41030e6 合并代码 并打开 MQ 以及邮箱
wei.peng 9eb7122e99 发布 正式版本 1.0
yunhao.wang cb95d0a713 项目pom版本更新为test
jimmy 4bda89ee5b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy 950303231f 提交代码
Silliter a7a39d7016 优化代码
Silliter 06d801be01 优化代码
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
wei.peng 6683c2bdc1 Merge remote-tracking branch 'origin/master'
wei.peng 5398a45033 Sonar Test
Silliter e45e68824f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter 800c77cf1d 解决冲突
jessica.chen af863ec5a1 更改质检枚举信息
yunhao.wang e92db6fd26 Merge remote-tracking branch 'origin/master'
yunhao.wang 203bfcb231 double非空判断
Silliter 3b61edb7ab 解决冲突
Silliter 11278ac43a 解决冲突
wei.peng 85e31cdc02 Merge remote-tracking branch 'origin/master'
wei.peng de979cfac6 登录功能优化
yunhao.wang d5bbf84965 hql日期封装
wei.peng d039586e05 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng ad67318f27 添加常量 
工具类代码优化
账号状态注释部分代码
jessica.chen beafe050ba Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jessica.chen c92d9e98e4 枚举修改
amy 256c2acd41 条码类型枚举添加
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 微服调用调整
alwaysfrin 2779046bf8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin 52d4a995d4 spring gateway添加 
细节调整
amy d2a3f4a9bf 返回实体代码字段添加
amy 4d8148ea9d 返回实体构造添加
jessica.chen 8bc9984e4e 组件中PO条码表中状态枚举
wei.peng bb9f6b28ce Merge remote-tracking branch 'origin/master'
wei.peng 804008410e 功能代码优化
Silliter 43ed6deb6c 解决冲突
Silliter 442ec7cb5f 解决冲突
jessica.chen e67151271b 组件中单据类型枚举新增
amy c9dd7ba3cb 参数类型枚举添加
amy 91e9252ed5 枚举添加
amy d2d4171e14 枚举添加
gragon.xu 69c2961bdc 冲突
gragon.xu c1e1a87333 一次性加载枚举
jessica.chen ae7c00576a 作业参数添加枚举状态
gragon.xu 9ad28091fa Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy df478b5ff5 枚举添加
gragon.xu 7154172d3b test
wei.peng 5dbf1bb2e8 自动填充信息Bug 修复
yunhao.wang 4229601ddb 消息管理封装
alwaysfrin 48f47956a2 基础对象调整
alwaysfrin 24df1f406a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin ffcd496e4e 微服优化，pom调整
wei.peng 855d9abef8 1、复杂树 功能完成
jimmy 9cda18eb32 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jimmy e5567ce4eb 修改代码
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调整
wei.peng 470dbb015e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng ef85c84e68 1、BaseRepositoryImpl 根据ID 查询Bug 修复 
2、更新字段名,更新对象名称
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 库存移动单状态枚举添加
jimmy b2d19f7cbf 合并sql
jimmy 64ea8f7fab 开发盘点主表、盘点冻结表、盘点实盘表
amy 21a79af65a 合并
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
柯裕 0634674c83 解决冲突
柯裕 c87c038410 meiju
gragon.xu fe92584fa8 开窗
gragon.xu 3fdeb69eee dragon
wei.peng dec260e3ca 代码优化
yunhao.wang 4303d11fa5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
yunhao.wang 1b76c95b7a 站内信 全部完成
gragon.xu 6f524abe28 枚举
Silliter eb8795e1a6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter d5b71f274f 单元测试开发工具类新增
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 增加枚举
柯裕 4ebe75e66c 新建枚举
amy c82ba74e9e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 88429e342e 枚举修改
frin.fei 3a34cfbd6b eureka、feign整合
frin.fei f07489d04d eureka、feign整合
yunhao.wang 4fb5f548cf 定时任务 完成 
表达式   完成
邮件工具类
Silliter d49a2661cf Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
Silliter f677400273 单元测试开发工具类新增
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 用户信息拆分
amy 477f6c5ff1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
amy 22d5ba1c0f 字段修改
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
amy ae61fad0d5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
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 查询条件添加
yunhao.wang 2abfc97d8e Merge remote-tracking branch 'origin/master'
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 cb34dad394 1，添加判断方法 
2，切面中，补全新增和修改的用户基础信息
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 0e589a8bb2 代码调整
alwaysfrin ab06c1e165 代码优化
alwaysfrin 6ffcdc3c33 日志分析工具持久化，baserepository优化
alwaysfrin 4e343b504b Merge remote-tracking branch 'origin/master'
alwaysfrin 9f903fa40c 日志分析工具
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 添加批量删除方法
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
Silliter df8ad87dc4 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 修改 
关系表添加构造函数
Administrator f7e750e3cb wms通用数据信息与字段实体增删改查
alwaysfrin dc0c0b0058 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
alwaysfrin d7b7501d19 mongodb工具方法，日志部分使用mongo
wei.peng f969257dea Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wei.peng 978bb1e8be 异常信息 添加 USER_LOGIN_NAME_EXCEPTION
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 f824f73733 HQL 别名o 改为 model
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 9bac06edae 组织管理功能完成
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 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 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 定时任务 
定时任务表达式     功能完成
    定时任务           功能完成

权限
    用户管理           功能完成
    用户登录           功能完成
wei.peng 9bdf8b90e6 添加 default example
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 cdb48374ac 移除iml文件的版本控制
wei.peng 9121cafcff 移除iml文件的版本控制
alwaysfrin 231efdcf13 ignore整理
alwaysfrin 40a7ef7e31 平台功能优化
alwaysfrin c9ce9035e5 国际化
alwaysfrin daf65deb32 国家化封装
wei.peng aaa0a1b21b 初始化系统配置
alwaysfrin a208e592bd 基础对象初始化