wei.peng
|
e4adb35413
|
自定义表单 数据对象 新增接口完成
|
6 years ago |
|
wei.peng
|
e4a3b95f16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1049a11576
|
自定义表单 数据对象 新增接口完成
|
6 years ago |
jessica.chen
|
c500681b5d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jessica.chen
|
00ee87f645
|
新增NC处理的操作类型枚举
|
6 years ago |
|
wei.peng
|
f039095f83
|
数据对象实体更新
创建数据对象 Model
|
6 years ago |
gragon.xu
|
a8f3307237
|
定时任务循环记录异常
|
6 years ago |
yunhao.wang
|
635cc27eb0
|
自定义表单布局接口
自定义表单菜单接口
自定义表单功能接口
|
6 years ago |
alwaysfrin
|
1897d227e6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
ea2eb6103d
|
优化调整
|
6 years ago |
Silliter
|
4aaa9bc03a
|
1.优化流程管家
2.开发条码打印，订单打印，收货回执打印
|
6 years ago |
|
wei.peng
|
bfd99830b6
|
FindBugs 提示Bug 修改
|
6 years ago |
|
alwaysfrin
|
3ec56056d3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
1dcdf36537
|
添加mes、mes-pcn、sweb三个微服
|
6 years ago |
|
wei.peng
|
01ee15e67a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
569e872ebc
|
自定义表单枚举添加
|
6 years ago |
Jack.lv
|
b9d00d181e
|
条码枚举
|
6 years ago |
|
gragon.xu
|
557f21bf6a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
bd6f6c0546
|
交易处理组件V2.0：库存交易表中数量类属性与库存表保持一致
|
6 years ago |
|
Jack.lv
|
73d2da12ed
|
po版本枚举
|
6 years ago |
|
Silliter
|
2e020d7be2
|
修改枚举类
|
6 years ago |
|
Silliter
|
dcfb0f5cdf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
738db8d837
|
条码打印开发，角色微服务提供
|
6 years ago |
jimmy
|
f52b3ff189
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
8da671628c
|
盘点PC
|
6 years ago |
|
Silliter
|
148d808129
|
枚举添加数据状态字段
|
6 years ago |
|
Silliter
|
c4ef1e66f3
|
开发条码打印后端
|
6 years ago |
|
alwaysfrin
|
7e9704db00
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
fd6552b4ac
|
定时任务封装
|
6 years ago |
柯裕
|
2b848e18e0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
a495ea2fce
|
更新质检枚举
|
6 years ago |
|
alwaysfrin
|
d62910737b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
5951d7fad8
|
schedule定时任务调整，fallback熔断机制改为factory模式
|
6 years ago |
|
Jack.lv
|
20cea81ea2
|
初始化状态为新建 枚举新增
|
6 years ago |
|
gragon.xu
|
a4301ce4b2
|
redis.pusHashMap
|
6 years ago |
|
gragon.xu
|
48161d95a1
|
枚举冲突
|
6 years ago |
|
gragon.xu
|
e7fa2f3abf
|
NC,盘点交易处理组件
|
6 years ago |
crish
|
249ca7f372
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
114816d483
|
删除多余枚举类
|
6 years ago |
|
alwaysfrin
|
1c7d601922
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
c4a9a4ac1e
|
解决id重复问题
|
6 years ago |
|
Silliter
|
aa1b4ac805
|
定时获取库存移动信息开发
|
6 years ago |
|
Silliter
|
142e2b47c9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
74b63d8a72
|
开发流程管家根据任务创建流程
|
6 years ago |
|
alwaysfrin
|
550f15cb35
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
207b7ea7eb
|
解决id重复问题及shiro授权bug
|
6 years ago |
|
Silliter
|
11a2a72917
|
枚举类加入禁用、启用、全部
|
6 years ago |
|
Silliter
|
41a1cc46e8
|
枚举条码状态调整
|
6 years ago |
|
crish
|
c0841bb89c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
24b38fefb0
|
入库添加枚举类
|
6 years ago |
|
gragon.xu
|
85d3463348
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
e1825eac40
|
交易处理组件ALL
|
6 years ago |
|
Silliter
|
d604b42c1d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
Silliter
|
e4600e1c01
|
定时获取库存移动信息开发
|
6 years ago |
|
alwaysfrin
|
ab63dadb1c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
8ac4046a7d
|
开发校验权限和获取个人任务列表公用方法
|
6 years ago |
|
wei.peng
|
6835593401
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
03fe15e2f4
|
自定义报表优化
|
6 years ago |
|
gragon.xu
|
201f960d08
|
冲突
|
6 years ago |
|
gragon.xu
|
31d91f48b3
|
收货交易处理组件开发
|
6 years ago |
|
柯裕
|
398a3d98c5
|
更新POJO
|
6 years ago |
|
Jack.lv
|
ed7857b86d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Jack.lv
|
b667d6840e
|
获取权限和根据权限获取任务列表
|
6 years ago |
|
jimmy
|
89bd80ea21
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jimmy
|
d41a4f0dc9
|
提交NC枚举
|
6 years ago |
|
alwaysfrin
|
8967fd21e6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
576743ed18
|
自定义表单，动态对象工具
|
6 years ago |
|
wei.peng
|
1e18495617
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1bdc307a1b
|
自定义报表 折线图功能完成
|
6 years ago |
|
yunhao.wang
|
62987c7d0f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
柯裕
|
f25395ebd6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
ce9cbe1198
|
更新pojo
|
6 years ago |
|
Jack.lv
|
296db97c72
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Jack.lv
|
6c6710dd67
|
在途库位 枚举修改
|
6 years ago |
|
yunhao.wang
|
54bc2fe482
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
8822f4f22f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
5b6b720d7d
|
优化报表
单号生成规则调整重置条件
|
6 years ago |
|
wei.peng
|
4b4fb30248
|
自定义报表 饼图功能完成
|
6 years ago |
|
gragon.xu
|
44148da43c
|
comit
|
6 years ago |
|
gragon.xu
|
0361d6bd79
|
业务类型统一存数字类型；关联单据类型统一存字符串类型
|
6 years ago |
|
wei.peng
|
86a70e758b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
44676161ad
|
自定义模板优化
echarts 工具新增
|
6 years ago |
|
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
|
6 years ago |
|
Silliter
|
ba90dfb123
|
开发交易处理主程序
|
6 years ago |
|
柯裕
|
933654a86a
|
增加库位状态枚举
|
6 years ago |
|
gragon.xu
|
d67d4fa929
|
SQLPACK冲突
|
6 years ago |
|
gragon.xu
|
1aa8f7fd1a
|
任务处理程序
|
6 years ago |
|
yunhao.wang
|
8e029e82e0
|
报表优化
解决bug
邮件消息优化
|
6 years ago |
|
Silliter
|
78ffcb9550
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
73181f1c1a
|
WMS实体对象重构，枚举修改
|
6 years ago |
|
yunhao.wang
|
ba36cfecd5
|
报表优化
国际化接口
|
6 years ago |
|
yunhao.wang
|
dedc7b45fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
b01e479cb3
|
报表优化
impp压测接口优化
消息队列非空验证
单号管理增加状态
|
6 years ago |
|
wei.peng
|
a3e1381736
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
4c83a05d0f
|
自定义报表 获取目录接口功能完成
|
6 years ago |
|
Silliter
|
ebb4cc9f2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
Silliter
|
bb0eda58f4
|
流程管家调整
|
6 years ago |
|
yunhao.wang
|
02f95f0939
|
性能测试
|
6 years ago |
|
yunhao.wang
|
23450c0218
|
bug解决
操作日志添加人员登录名称
|
6 years ago |
|
yunhao.wang
|
db8a4fbe6f
|
日志白名单
|
6 years ago |
|
yunhao.wang
|
b28cab255d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
295d4c9ac9
|
报表布局 行高,列宽设置
MongoDB id 映射处理
|
6 years ago |
|
alwaysfrin
|
16daf7c1b9
|
修改了
|
6 years ago |
|
wei.peng
|
c61d0882c5
|
模板管理生成HTML 完成
|
6 years ago |
|
wei.peng
|
42f00211c1
|
模板确认接口完成
模板状态扭转功能完成
|
6 years ago |
|
wei.peng
|
19a8189b05
|
模板管理 后台功能完成
|
6 years ago |
|
wei.peng
|
2bd16137bd
|
模板管理 后台功能完成
|
6 years ago |
|
yunhao.wang
|
e35113c519
|
报表排版实体变更
|
6 years ago |
|
wei.peng
|
1e43b2e36f
|
模板Pojo 调整
|
6 years ago |
|
wei.peng
|
dd9c35e6e1
|
模板Pojo 调整
模板 枚举 添加
添加枚举接口
|
6 years ago |
|
wei.peng
|
c5f3897bc9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
7ccd5613b3
|
目录联调Bug 修复
模板Pojo 创建
模板枚举定义
|
6 years ago |
|
alwaysfrin
|
cfbd536004
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
cb30fc88b2
|
添加了线程池和消息队列的交换机机制
|
6 years ago |
|
yunhao.wang
|
504c3e871c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
42a38392fc
|
报表元素接口
|
6 years ago |
|
wei.peng
|
cb59664740
|
新增获取目录类型接口
新增查询关联角色接口
枚举名称调整
|
6 years ago |
|
yunhao.wang
|
69d385d6d5
|
报表元素
|
6 years ago |
|
alwaysfrin
|
d7aa0bda87
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
989ad48653
|
主键生成策略调整，日志部分调整
|
6 years ago |
|
yunhao.wang
|
77296816e6
|
通用导出
单号规则导入导出
系统参数添加组
|
6 years ago |
|
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
|
6 years ago |
|
yunhao.wang
|
c4b0e3ba0e
|
解决bug
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
|
6 years ago |
|
wei.peng
|
79ad222295
|
用户密码加密侧率功能完成
|
6 years ago |
|
alwaysfrin
|
b8a1196a45
|
添加自定义组件
|
6 years ago |
amy
|
effa749d3f
|
#
|
6 years ago |
|
alwaysfrin
|
2498c50bfd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
47ebc8795a
|
getSingleResult优化
|
6 years ago |
|
yunhao.wang
|
436f8ca139
|
解决bug
|
6 years ago |
|
yunhao.wang
|
02e31b07c8
|
定时任务日志完成
解决bug
|
6 years ago |
|
wei.peng
|
b3d7cb259e
|
组织管理父节点Bug 修复
复杂查询添加默认排序
|
6 years ago |
|
yunhao.wang
|
609c1557d3
|
bug解决
|
6 years ago |
|
yunhao.wang
|
d30a3685d1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
4f828e8fab
|
定时任务重写
|
6 years ago |
|
alwaysfrin
|
2dedd836f5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
46335b8a81
|
redis会话优化
|
6 years ago |
|
Silliter
|
b8d4a3a08a
|
流程管家优化
|
6 years ago |
|
Silliter
|
b55906ced0
|
生产领料优化
|
6 years ago |
|
gragon.xu
|
a5e05ef36e
|
修改流程管家在调组件之前对组件参数的过滤条件：组件参数类型为30的不用验证，组件名为prompt的不用验证
|
6 years ago |
|
yunhao.wang
|
ea621d14f8
|
定时任务修改
|
6 years ago |
|
yunhao.wang
|
6b06d3ff04
|
bug解决
添加默认字典项
ics添加全局异常捕获
|
6 years ago |
|
amy
|
f456ff2f75
|
入库上架扫描条码
|
6 years ago |
|
amy
|
f2d7279e94
|
计算bug修改
|
6 years ago |
|
jimmy
|
a9ab449316
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jimmy
|
159892b64d
|
修改
|
6 years ago |
|
amy
|
e329c69aa5
|
公用计算方法修改
|
6 years ago |
|
wei.peng
|
79ee50684e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
0988c1ad26
|
用户登录优化
|
6 years ago |
|
yunhao.wang
|
62f601d287
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
5ee989b9a5
|
bug解决
|
6 years ago |
|
alwaysfrin
|
25bf0de397
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
fc2a6c515c
|
计算方法名调整为find
|
6 years ago |
|
alwaysfrin
|
3a86ae3980
|
新增通用计算方法
|
6 years ago |
|
jimmy
|
a2695771e0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
fe67546768
|
开发质检组件 扫描箱条码 扫描箱条码回显 处理箱条码
|
6 years ago |
|
alwaysfrin
|
6118568fd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
91a4386978
|
调整software序号
|
6 years ago |
|
yunhao.wang
|
6821bb17cc
|
枚举名称统一
|
6 years ago |
|
wei.peng
|
ffb29d0d03
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
c221d618ea
|
登录日志功能完成
|
6 years ago |
|
yunhao.wang
|
bb289774d9
|
dashboard部分功能
修复bug
|
6 years ago |
|
alwaysfrin
|
4a89439b30
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
f775968194
|
扩展块功能
|
6 years ago |
|
amy
|
0429edfb61
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
amy
|
b58b06f1a3
|
作业流程明细动作类型添加
|
7 years ago |
|
yunhao.wang
|
c6399fb209
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
4fe87c5ce2
|
解决bug
|
7 years ago |
|
wei.peng
|
786c652900
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
95a58d97a2
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
bd3ab06440
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
wei.peng
|
35ecf85881
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
47dd4c68b5
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
d9214fd746
|
动态表单 基础功能完成
|
7 years ago |
|
wei.peng
|
2ad41030e6
|
合并代码 并打开 MQ 以及邮箱
|
7 years ago |
|
wei.peng
|
9eb7122e99
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
cb95d0a713
|
项目pom版本更新为test
|
7 years ago |
|
jimmy
|
4bda89ee5b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
950303231f
|
提交代码
|
7 years ago |
|
Silliter
|
a7a39d7016
|
优化代码
|
7 years ago |
|
Silliter
|
06d801be01
|
优化代码
|
7 years ago |
|
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
|
7 years ago |
|
yunhao.wang
|
d7b4b1f7ab
|
transient 替换为 @Transien
|
7 years ago |
|
wei.peng
|
6683c2bdc1
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
5398a45033
|
Sonar Test
|
7 years ago |
|
Silliter
|
e45e68824f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
800c77cf1d
|
解决冲突
|
7 years ago |
|
jessica.chen
|
af863ec5a1
|
更改质检枚举信息
|
7 years ago |
|
yunhao.wang
|
e92db6fd26
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
203bfcb231
|
double非空判断
|
7 years ago |
|
Silliter
|
3b61edb7ab
|
解决冲突
|
7 years ago |
|
Silliter
|
11278ac43a
|
解决冲突
|
7 years ago |
|
wei.peng
|
85e31cdc02
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
de979cfac6
|
登录功能优化
|
7 years ago |
|
yunhao.wang
|
d5bbf84965
|
hql日期封装
|
7 years ago |
|
wei.peng
|
d039586e05
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
ad67318f27
|
添加常量
工具类代码优化
账号状态注释部分代码
|
7 years ago |
|
jessica.chen
|
beafe050ba
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
c92d9e98e4
|
枚举修改
|
7 years ago |
|
amy
|
256c2acd41
|
条码类型枚举添加
|
7 years ago |
|
gragon.xu
|
7a8baf42d7
|
冲突
|
7 years ago |