602 Commits (a7833ea9dd301ec16f374363adcc994bcfb8c1fd)

Author SHA1 Message Date
gragon.xu fb78a04969 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 863b7b0d61 移动单条码的行号不做为查询条件
交易处理组件:出入移库:移动单明细可能没有关联单据,所以只能根据源库位类型和质量状态更新库存相应数量
6 years ago
jessica.chen 426b2e8952 质检枚举修改 6 years ago
alwaysfrin 7876ab6475 hql封装优化 6 years ago
jimmy 6755e5ade3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 4ba121d7c9 架构修改基础方法 6 years ago
Silliter 36034d4925 查询优化 6 years ago
Silliter 261c9bea38 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
gragon.xu a7370f4cc0 调用获取单号 6 years ago
Silliter 92c5457521 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
gragon.xu 2b91b9a1d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 59b086dc5d BaseBean.findByHqlWhere:查询别名代码错误
WmsHqlPack:修改封装方法使用DdlHqlPack
任务合并代码错误
6 years ago
wei.peng d59318a024 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng ccce8c009c 级联功能接口完成 6 years ago
Silliter b9d013280f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yihang.lv 87895eb194 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 709c018fb4 Sweb更新到订单明细修改历史记录查询 6 years ago
yunhao.wang cb6b06cb6a Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
alwaysfrin 97e0889971 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 4f0e3756df 优化调整 6 years ago
yunhao.wang faa8a0d1c7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 865add1f7f 按钮功能接口 6 years ago
Silliter ee1488d28e Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
gragon.xu 6b8ac6240d LINK_ORDER_TYPE无需数值 6 years ago
Silliter e8deda24fe Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
amy ecdd1d45de 是否散件枚举添加 6 years ago
Silliter fe644066af Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
alwaysfrin 244494d77b hql封装优化 6 years ago
wei.peng 04ed151d45 元素管理接口完成(未测试) 6 years ago
Silliter 38311760a1 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
jimmy cd00bdd954 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 3c2a345b93 盘点pc端 6 years ago
wei.peng 93f4745afd Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
#	pom.xml
6 years ago
wei.peng 7190c8ff6f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 045c68ee2e 数据对象管理接口开发完成 6 years ago
柯裕 3d8b3983c3 优化枚举 6 years ago
gragon.xu ff4c50c5f1 枚举统一 6 years ago
gragon.xu 0ed4691114 枚举统一 6 years ago
gragon.xu 8b3b37260e 枚举统一 6 years ago
Silliter e8de83b696 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter afa2ac746a 定时获取库存移动信息开发 6 years ago
Silliter dbeb965e9b Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
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
Silliter 2d6e3b5545 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 635cc27eb0 自定义表单布局接口
自定义表单菜单接口
自定义表单功能接口
6 years ago
Silliter 111c6177c9 Merge remote-tracking branch 'remotes/origin/dev' into test 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 dd0af51d8f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter 4aaa9bc03a 1.优化流程管家
2.开发条码打印,订单打印,收货回执打印
6 years ago
wei.peng bfd99830b6 FindBugs 提示Bug 修改 6 years ago
Silliter 6396056d08 Merge remote-tracking branch 'remotes/origin/dev' into test 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
Silliter b1f195a185 Merge remote-tracking branch 'remotes/origin/dev' into test 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 e1519f832f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter 148d808129 枚举添加数据状态字段 6 years ago
Silliter 618ce5d560 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter c4ef1e66f3 开发条码打印后端 6 years ago
wei.peng 8ec8dba414 Merge remote-tracking branch 'remotes/origin/dev' into test 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
Silliter 9ee4956924 Merge remote-tracking branch 'remotes/origin/dev' into test 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
Silliter 6464cbd533 Merge remote-tracking branch 'remotes/origin/dev' into test 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 62196df6bf Merge remote-tracking branch 'remotes/origin/dev' into test 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
Silliter de5760bba1 Merge remote-tracking branch 'remotes/origin/dev' into test 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 0a5c19ebe5 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
柯裕 d2190c55c7 解决冲突 6 years ago
柯裕 8edf27d389 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 9a6a9018cf 更新枚举 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
Silliter cc4484a562 Merge remote-tracking branch 'remotes/origin/dev' into test 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 adfe3cb2e6 Merge remote-tracking branch 'remotes/origin/dev' into test 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 3fce943723 Merge remote-tracking branch 'remotes/origin/dev' into test 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 a68771db32 Merge remote-tracking branch 'remotes/origin/dev' into test 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 a2bbd4b5f0 Merge remote-tracking branch 'remotes/origin/dev' into test 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 7d4f3ebb67 Merge remote-tracking branch 'remotes/origin/dev' into test 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
Silliter c45091584c Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
alwaysfrin b8a1196a45 添加自定义组件 6 years ago
Silliter dd11ff1e71 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
amy effa749d3f # 6 years ago
Silliter ff4812ae04 Merge remote-tracking branch 'remotes/origin/dev' into test 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
Silliter 65fead254f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 436f8ca139 解决bug 6 years ago
Silliter 180c8c230c Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 02e31b07c8 定时任务日志完成
解决bug
6 years ago
wei.peng 8a8f3dbb57 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago