1525 Commits (f343ea865c01b9645cb386b2d2bad159f87efde3)

Author SHA1 Message Date
wei.peng 1e797d0dac 级联功能接口完成(未测试) 6 years ago
yunhao.wang 20a502f3bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 9beafd1bc6 自定义表单 功能权限管理接口
微服调整 平台角色获取方法调整
6 years ago
yihang.lv da3490acbf sweb repository init 9 files 6 years ago
yihang.lv acc8e97825 sweb bean init 9 files 6 years ago
amy 126f47ae33 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 1b97e377f2 pojo引入jar包 6 years ago
amy 6fb971cd60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy 9b8ebb5628 实体数量处理 6 years ago
gragon.xu 4ea0448f8c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 0e9315cd89 作业任务生成事务控制 6 years ago
alwaysfrin 244494d77b hql封装优化 6 years ago
wei.peng d3331e4e12 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 04ed151d45 元素管理接口完成(未测试) 6 years ago
yunhao.wang dc9fbb2919 添加拦截器接口 6 years ago
Rock.Yu c38a62955d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu bd4df83519 1. 增加脚本引用 POJO 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
yunhao.wang 513fa332c8 测试 6 years ago
柯裕 9477ba5c91 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 1bd875d264 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang 6efb49aca5 表单功能接口优化
表单布局接口优化
表单菜单接口优化
6 years ago
柯裕 26b4f3e5b4 调整微服务入参 6 years ago
alwaysfrin ffeaf1e25c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 8fb36134a6 shiro会话id优化,自动update赋值优化 6 years ago
Silliter 5a557495af Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 84c07f3db0 优化单据打印业务 6 years ago
gragon.xu dd31efa945 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 9a185abed1 调用获取单号不需要SID+盘点实体添加是否散件字段 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
yunhao.wang c2e01000e5 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang 5a7e6c318a 定时任务优化
表单布局优化
6 years ago
柯裕 1f50fecf80 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 0211390c44 PO明细实体状态数据类型更新为Integer;
PO明细查询封装hql单据编号匹配改为equal
6 years ago
gragon.xu ff4c50c5f1 枚举统一 6 years ago
gragon.xu 0ed4691114 枚举统一 6 years ago
gragon.xu 8b3b37260e 枚举统一 6 years ago
gragon.xu 2987e34dc7 ASN,PO明细表,产品入库表的ERPWHNO改成ERPAREANO 6 years ago
jimmy e09d96a925 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy b2544dcb43 盘点调差开发 6 years ago
amy 69cef0bf3a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy ecde67e47e 修改 6 years ago
Silliter 287a9b3892 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 9a7c26338a 订单打印,流程管家优化 6 years ago
柯裕 e2a6619dcc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 130343ea6b PO明细实体更新 6 years ago
yihang.lv ec34456b6f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv b41e06f412 wmsPOMasterDetails erpWhNo---》 erpAeraNo 6 years ago
Silliter afa2ac746a 定时获取库存移动信息开发 6 years ago
Silliter fea99120ca Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 4be69f77c0 开发单据打印 6 years ago
柯裕 913dcae75f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 85493e4f88 散件收货查询 6 years ago
wei.peng 679a9107f5 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng e4adb35413 自定义表单 数据对象 新增接口完成 6 years ago
gragon.xu 2ce0dcbaf1 dragon 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
amy 1560a9b73d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy fb819c27b2 实体字段添加 6 years ago
yihang.lv 39ddab4cf9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv e4bbd3a1a1 物料表 添加 是否条码管理 6 years ago
amy ce9ad43cd8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy e4a271cd4f 庫位物料新增是否生成領料單字段 6 years ago
gragon.xu 2a38dc0b0c 库位的零件数量为Double类型 6 years ago
jimmy 2192ecdb18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 871fae62ec 重写库位get方法 6 years ago
Silliter d67cdc6900 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
Silliter ec50aef781 开发单据打印 6 years ago
yunhao.wang 8850f28cd1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang fc44c4919f 定时任务计划添加参数 6 years ago
jimmy 94f588cfdb 盘点PAD组件 6 years ago
wei.peng f039095f83 数据对象实体更新
创建数据对象 Model
6 years ago
柯裕 b65f6197c5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 2e578200d8 质检主表添加是否散件字段 6 years ago
Silliter 3e9a40a47a 开发提交按钮控制 6 years ago
gragon.xu a8f3307237 定时任务循环记录异常 6 years ago
Silliter b99c28e1b1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter a889e00cba 优化任务列表 6 years ago
amy cd3ef63c90 po是否散件字段添加 6 years ago
amy 4dd8bd3b5c 移库单字段新增 6 years ago
gragon.xu 7f55f210b6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 8ef0e787b9 交易反向处理 6 years ago
yunhao.wang 287b076dee Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 635cc27eb0 自定义表单布局接口
自定义表单菜单接口
自定义表单功能接口
6 years ago
Silliter d14e0a5cb2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 046ece7221 流程管家优化 6 years ago
yihang.lv 2cf97f8ed1 移库单订单条码表 分页查询 条件去掉 partNameRdd 6 years ago
yihang.lv f9a820dae4 bean 所有QTY数量默认为0修改 6 years ago
yihang.lv 1176053fe9 移库单条码表增删改查 6 years ago
jessica.chen e4aa1cfbc3 库存移动明细数据实体 6 years ago
yunhao.wang aa98d8dc14 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang fbc72a4f11 表单报表部分功能
定时任务优化
6 years ago
Silliter 1f4a00f39e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 01dc635d38 开发流程管家 6 years ago
alwaysfrin e10d71919a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 6f8f13c552 根据类型查询库位分页 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 ee174c5489 实体优化 6 years ago
Silliter 4aaa9bc03a 1.优化流程管家
2.开发条码打印,订单打印,收货回执打印
6 years ago
yunhao.wang 2ba8b1498b 字典微服务调整
定时任务优化
自定义表单实体
6 years ago
wei.peng bfd99830b6 FindBugs 提示Bug 修改 6 years ago
wei.peng 0d8c69a9c6 自定义表单 初始化 6 years ago
wei.peng 1197412359 自定义表单 初始化 6 years ago
gragon.xu 3be87f2882 作业任务表:“是否配料”->“是否一步法操作” 6 years ago
gragon.xu 6b9823cd64 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 18fc77b99c 反向交易处理程序+作业任务新增“是否一步法”字段 6 years ago
Silliter 5f76a14276 优化条码打印功能 6 years ago
yunhao.wang e50ebc310f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 5f746792c5 字典微服务调整
定时任务优化
6 years ago
yunhao.wang 498fbea67b 定时任务微服优化 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
gragon.xu ca8b9462b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 970fa83557 dragon 6 years ago
Jack.lv b9d00d181e 条码枚举 6 years ago
Silliter 75e622763c 解决冲突 6 years ago
Silliter 234aad93e3 1.优化流程管家
2.任务列表查询加入任务状态字段
6 years ago
gragon.xu c9215a7079 任务明细没有工厂;任务合并hql语法错误 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 09264b8f4b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv 73d2da12ed po版本枚举 6 years ago
jimmy 4e8ab00fed Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 6cf53459e2 修改代码 6 years ago
amy 8df7fb3f4b Merge remote-tracking branch 'origin/dev' into dev 6 years ago
gragon.xu 78d551f8e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 4ef08afaa7 dragon 6 years ago
Silliter 2e020d7be2 修改枚举类 6 years ago
amy bf24e3f58c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy ebc92f6290 实体新增临时字段 6 years ago
jimmy 8d442fcafa 修改代码 6 years ago
Jack.lv 5c6ab755dd userTime改为userTime 6 years ago
Jack.lv eb37a1f7ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv fa4c4cd957 作业类型删除处理组件编号和数据来源编号 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
柯裕 bbfd340fd0 质检 6 years ago
Silliter e20936ca2b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter c4ef1e66f3 开发条码打印后端 6 years ago
amy 6630842f3c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy b883f7de2d 添加临时变量 6 years ago
yunhao.wang 9f41b29d95 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 4055e6fa76 字典调整 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 f0e98012ef Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 05efe333cc 开发打印模板功能 6 years ago
Jack.lv 630c6e8f66 作业处理组件增删改查、作业任务明细查询、作业任务生成日志查询完成 6 years ago
Silliter 11bbe2a57d 优化流程管家 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
Jack.lv 1e6db01537 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv 972d2b04a7 wmshpak删除多余代码 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 8503fbcc48 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter aa1b4ac805 定时获取库存移动信息开发 6 years ago
jessica.chen 30996a92a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 166b725e43 出库组件新增 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 ab3720a134 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
Silliter 11a2a72917 枚举类加入禁用、启用、全部 6 years ago
gragon.xu 87a033a427 外部单据的计划时间全部从zDate,zTime改成planDate,planTime,否则HQL执行失败 6 years ago
gragon.xu 868be93389 质检单和移库单主表的CUSTOMER_NO修改成了CUST_NO 6 years ago
gragon.xu d81cbc0148 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 8a58b48826 移库单主表去掉物料号,物料名称,数量属性 6 years ago
Silliter 41a1cc46e8 枚举条码状态调整 6 years ago
Jack.lv a8736a4747 新增、修改、查询 数据权限 6 years ago
Jack.lv de856500d9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 16d429ceac Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang 093a67f541 条码规则解析Demo
元素名称唯一校验
文件上传优化
6 years ago
Jack.lv 33103ed427 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv c0be6489a3 bean修改 Warehouse 回退为原来的code 、 name 、address 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
Jack.lv 56568be77e bean修改 WmsHqlPack 同步pdm 6 years ago
yunhao.wang 307f07e7ed 条码规则管理
微服条码解析
6 years ago
Jack.lv f6c64a8632 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv d6def493e4 bean修改 同步pdm 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 238160a65f 数据访问层优化 6 years ago
gragon.xu a7dea093d7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 86e96e8f76 交易处理组件公共方法提取 6 years ago
Silliter 9c08de7a7a 定时获取库存移动信息开发 6 years ago
Silliter 9401fb9b00 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 8ac4046a7d 开发校验权限和获取个人任务列表公用方法 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
jimmy 9e65f08265 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy d289e7009a 增加移库移动明细表 已移库数量 6 years ago
yunhao.wang 2943bfcf9f 添加批量删除任务计划功能 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 274c5aec26 dragon 6 years ago
gragon.xu 201f960d08 冲突 6 years ago
gragon.xu 31d91f48b3 收货交易处理组件开发 6 years ago
柯裕 398a3d98c5 更新POJO 6 years ago
gragon.xu f662140075 WmsOrderMasterModel无用了 6 years ago
gragon.xu 7e8965421e WmsOrderDetailsModel 6 years ago
amy 946d4bf634 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy 1fd8e5e76f 实体字段添加 6 years ago
gragon.xu ded9b1c37f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu d89770e138 作业任务处理程序 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
wei.peng d6dba36f0e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng e28dfa55c6 自定义报表Bug 修复 6 years ago
jimmy 89bd80ea21 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jimmy d41a4f0dc9 提交NC枚举 6 years ago
jessica.chen 1a5369f09c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 0ce23f95b1 拆分组件修改 6 years ago
alwaysfrin 8967fd21e6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin dcdaece309 自定义表单对象 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
柯裕 e3ae013868 更新POJO 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
gragon.xu e3a87e5d2e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu fc89b8493d 移库单明细新增源,目库存地属性 6 years ago
Silliter bdf8a8993f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter a5390d7b1a 开发拆分条码逻辑 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
gragon.xu 3056922b15 POMasterDetails修改属性名whNo->erpWhNo 6 years ago
yunhao.wang 5b6b720d7d 优化报表
单号生成规则调整重置条件
6 years ago
wei.peng 155aa6d6e6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 4b4fb30248 自定义报表 饼图功能完成 6 years ago
gragon.xu 4d3b4ac15c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 44148da43c comit 6 years ago
Rock.Yu 4d5b9da91d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu 9a9c7ba7ec 1. 增加获取条码下一步状态的实体类 6 years ago
Silliter adb7f189f1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 7ba8fa832c 定时获取库存移动信息开发 6 years ago
Rock.Yu 288ecaedba 1. 增加获取条码下一步状态的 POJO 类 6 years ago
gragon.xu 5bc4d9140b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 8a38eca2f0 获取WmsConfig 6 years ago
amy 1f27756f9b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy 8a9d09dbdf wms系统参数表新增 6 years ago
amy 770b294029 wms系统参数表新增 6 years ago
柯裕 20f8730f41 新建移库单条码DAO 6 years ago
gragon.xu 0361d6bd79 业务类型统一存数字类型;关联单据类型统一存字符串类型 6 years ago
Rock.Yu d64ef34b4a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 1093680f89 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu d6154a3c14 Transient包引错 6 years ago
Rock.Yu 407c24e516 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 2133221748 循环依赖 问题修复 6 years ago
Rock.Yu 964a623119 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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 e9a04ec960 解决冲突 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
Rock.Yu 4b5046ad44 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu 4ccdf4c774 1. 增加了条码状态检查的规则实体类 6 years ago
gragon.xu d67d4fa929 SQLPACK冲突 6 years ago
gragon.xu 1aa8f7fd1a 任务处理程序 6 years ago
jessica.chen 5b7f23ca82 拆分组件新增 6 years ago
jessica.chen 5378284454 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 268f86b602 库存移动条码表实体修改 6 years ago
yunhao.wang 7d27ca8a3f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 8e029e82e0 报表优化
解决bug
邮件消息优化
6 years ago
Silliter b0d34a04b4 调整model实体 6 years ago
Silliter e80d476902 调整model实体 6 years ago
Silliter 3faba3bbc2 实体调整 6 years ago
Silliter 380f16943f 库位,条码服务创建 6 years ago
Silliter 8a78c19329 库位,条码服务创建 6 years ago
yunhao.wang 252ccce1e5 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang 4154b60249 报表优化
解决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 4adc5327be Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang e5d1f3cf07 报表优化 6 years ago
wei.peng ef6d24682e 自定义报表 代码优化
软适配 项目初始化增删改
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 d9d38bd991 自定义报表 获取目录接口功能完成 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
alwaysfrin 5f5db23021 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin d52a17b131 修改了 6 years ago
yunhao.wang db8a4fbe6f 日志白名单 6 years ago
yunhao.wang fef135791c 定时任务异常通知
网关返回信息类型改为 BaseResultBean
添加队列监听开关
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 6cffcaecac 目录管理 优化 6 years ago
wei.peng c61d0882c5 模板管理生成HTML 完成 6 years ago
yunhao.wang 4769c6bc29 报表元素管理 6 years ago
yunhao.wang 1bf0925ded Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 42f00211c1 模板确认接口完成
模板状态扭转功能完成
6 years ago
yunhao.wang dbe4933fbb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 07d0661205 报表元素调整 6 years ago
wei.peng ae08c3ef76 模板管理 后台功能完成 6 years ago
wei.peng 19a8189b05 模板管理 后台功能完成 6 years ago
wei.peng 2bd16137bd 模板管理 后台功能完成 6 years ago
yunhao.wang 40d37ed5c9 文件微服务接口
报表元素 上传图片文件
6 years ago
yunhao.wang d0cee703fe 测试邮件发送 6 years ago
yunhao.wang e35113c519 报表排版实体变更 6 years ago
wei.peng 1e43b2e36f 模板Pojo 调整 6 years ago
wei.peng 324c7aa413 自定义报表 目录功能 联调完成 6 years ago
wei.peng 86da7bcdac Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng dd9c35e6e1 模板Pojo 调整
模板 枚举 添加
添加枚举接口
6 years ago
yunhao.wang 4c94ed04dc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 7d8feb77cd 报表布局接口
block service切面
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 d9d7f5eea1 report url 调整 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
wei.peng 6c0d6f6b31 自定义报表 数据库配置更新 创建目录管理 服务
目录功能完成
6 years ago
wei.peng 6096a6205a 自定义报表 数据库配置更新 创建目录管理 服务
目录功能完成
6 years ago
wei.peng fd4fef9aa6 自定义报表 数据库配置更新 创建目录管理 服务
目录功能完成
6 years ago
yunhao.wang 69d385d6d5 报表元素 6 years ago
wei.peng d75826f76c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 5816a93651 自定义报表 目录实体提交 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 879178697d # 6 years ago
amy b2f6b3255a 实体修改 6 years ago
Silliter 0f0611d9ee Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 8d4d8c1b1a 开发返回pda实体 6 years ago
amy effa749d3f # 6 years ago
wei.peng afcfad8fdb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
wei.peng 9064b6528b 树形结构查列表完成 6 years ago
yunhao.wang 436f8ca139 解决bug 6 years ago
yunhao.wang 02e31b07c8 定时任务日志完成
解决bug
6 years ago
wei.peng b3d7cb259e 组织管理父节点Bug 修复
复杂查询添加默认排序
6 years ago
wei.peng 5241d27279 账号管理功能更新 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
amy cbf734b0b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter b4e1d97d10 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
Silliter b55906ced0 生产领料优化 6 years ago
gragon.xu e167913e66 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu b41698ba1b 移库单信息BUG 6 years ago
Silliter a1ceda9f16 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 3fcdba6c94 生产领料优化 6 years ago
amy 339d04f56f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu a5e05ef36e 修改流程管家在调组件之前对组件参数的过滤条件:组件参数类型为30的不用验证,组件名为prompt的不用验证 6 years ago
amy 20cdd4170c 盘点状态实体枚举添加 6 years ago
yunhao.wang 19e134074e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang ea621d14f8 定时任务修改 6 years ago
wei.peng bb9444fc91 用户登录信息封装 6 years ago
wei.peng 00715312f0 根据组织Id 集合、部门ID 集合 查询账号信息 6 years ago
wei.peng 0550adce28 用户管理更新 6 years ago
wei.peng 115183132d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 3750b11b88 用户管理更新 6 years ago
yunhao.wang 6ef7931692 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 6b06d3ff04 bug解决
添加默认字典项
ics添加全局异常捕获
6 years ago
amy 5d7e5567be 主表状态值更新 6 years ago
amy e4a2c6a5eb 移库单明细临时字段添加 6 years ago
amy 9e49372cf5 添加hql目标文件规范化 6 years ago
amy 294560df40 查询方法修改 6 years ago
柯裕 1df72e1d4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 93ff5ad071 移动条码对象封装 6 years ago
amy f456ff2f75 入库上架扫描条码 6 years ago
yunhao.wang af3cd73af4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 08d8281fd5 定时任务
dashboard
6 years ago
wei.peng 5a5ed82201 添加 Cloud 获取组织或者部门下面的人员信息功能完成 6 years ago
wei.peng 015223fba8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 43bf2d2dba 菜单添加首字母缩写功能
部门管理 查询组织查询递归查询
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 e8741f7628 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy e329c69aa5 公用计算方法修改 6 years ago
Silliter 52afc18c1a 解决冲突 6 years ago
Silliter dadd0a2f30 解决冲突 6 years ago
gragon.xu e31440345c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 456a1dc8b9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy abce5adfd7 修改库存移动单条码信息 状态注释 6 years ago
Silliter 1594ae5843 解决冲突 6 years ago
Silliter 2ce7eebf7b 解决冲突 6 years ago
Silliter 91ee0d37d3 解决冲突 6 years ago
wei.peng 4940d8f055 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 0a8ffd10ec 组件优化 6 years ago
wei.peng ade4ec3600 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 18fa7b8e8e 用户菜单权限优化 6 years ago
amy 0fbb0fa3ca 库存移动单字段修改 6 years ago
amy b146a7bd0b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy 5f693abd08 库存移动明细 6 years ago
Silliter 6ade9a50f9 解决冲突 6 years ago
Silliter e5b99693f7 解决冲突 6 years ago
Silliter 01689fde87 解决冲突 6 years ago
gragon.xu 004a7969d7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 821f7fc380 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 3c027cef03 解决冲突 6 years ago
jimmy 586454a288 修改库位类型 6 years ago
jimmy 9646f1b3d3 修改2858 6 years ago
wei.peng 79ee50684e Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng 0988c1ad26 用户登录优化 6 years ago
Silliter 201afe2cb0 流程管家业务优化 6 years ago
Silliter 4346fe48f0 流程管家业务优化 6 years ago
Silliter 4bee0dab71 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter cfd1a26b36 流程管家业务优化 6 years ago
gragon.xu 7ddbc5f76b 流程管家在每次调用组件之前要验证当前redis中是否包含组件所需参数,不满足则抛异常 6 years ago
yunhao.wang 62f601d287 Merge remote-tracking branch 'origin/dev' into dev 6 years ago