1188 Commits (863b7b0d61e906b6c96e3f0fbb699991d1f320a1)

Author SHA1 Message Date
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