832 Commits (a7833ea9dd301ec16f374363adcc994bcfb8c1fd)

Author SHA1 Message Date
柯裕 2988f34bbd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 6b89f8d572 更新实体 6 years ago
amy fcc36ef7f6 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
amy c1b477dd32 修改 6 years ago
柯裕 c43a166a25 优化module 6 years ago
Silliter fa2303d838 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
柯裕 956c8c0362 增加临时变量 6 years ago
Silliter ee1488d28e Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
柯裕 1f11a6f280 更新实体 6 years ago
Silliter e8deda24fe Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
柯裕 6944deef54 实体类更新 6 years ago
jimmy a6dd9e53ec Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 3902dcca43 盘点PDA端 6 years ago
amy 006fe4b95a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy ecdd1d45de 是否散件枚举添加 6 years ago
柯裕 98d4f691f1 优化 6 years ago
Silliter fe644066af Merge remote-tracking branch 'remotes/origin/dev' into test 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 0e9315cd89 作业任务生成事务控制 6 years ago
Silliter 38311760a1 Merge remote-tracking branch 'remotes/origin/dev' into test 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
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
柯裕 9477ba5c91 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 26b4f3e5b4 调整微服务入参 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
柯裕 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 8b3b37260e 枚举统一 6 years ago
gragon.xu 2987e34dc7 ASN,PO明细表,产品入库表的ERPWHNO改成ERPAREANO 6 years ago
Silliter 0ad159581c Merge remote-tracking branch 'remotes/origin/dev' into test 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 e8de83b696 Merge remote-tracking branch 'remotes/origin/dev' into test 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 b41e06f412 wmsPOMasterDetails erpWhNo---》 erpAeraNo 6 years ago
Silliter dbeb965e9b Merge remote-tracking branch 'remotes/origin/dev' into test 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
gragon.xu 2ce0dcbaf1 dragon 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 ec50aef781 开发单据打印 6 years ago
jimmy 94f588cfdb 盘点PAD组件 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
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 8ef0e787b9 交易反向处理 6 years ago
Silliter 6d8a8f4bb9 Merge remote-tracking branch 'remotes/origin/dev' into test 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
Silliter 2292738c7d Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
jessica.chen e4aa1cfbc3 库存移动明细数据实体 6 years ago
Silliter 111c6177c9 Merge remote-tracking branch 'remotes/origin/dev' into test 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 dd0af51d8f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter 4aaa9bc03a 1.优化流程管家
2.开发条码打印,订单打印,收货回执打印
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
Silliter 6396056d08 Merge remote-tracking branch 'remotes/origin/dev' into test 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 d19d57979f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter 75e622763c 解决冲突 6 years ago
Silliter 234aad93e3 1.优化流程管家
2.任务列表查询加入任务状态字段
6 years ago
gragon.xu c9215a7079 任务明细没有工厂;任务合并hql语法错误 6 years ago
Silliter b1f195a185 Merge remote-tracking branch 'remotes/origin/dev' into test 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
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 618ce5d560 Merge remote-tracking branch 'remotes/origin/dev' into test 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
wei.peng 8ec8dba414 Merge remote-tracking branch 'remotes/origin/dev' into test 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
Jack.lv 630c6e8f66 作业处理组件增删改查、作业任务明细查询、作业任务生成日志查询完成 6 years ago
Silliter 11bbe2a57d 优化流程管家 6 years ago
Silliter 6464cbd533 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
gragon.xu 48161d95a1 枚举冲突 6 years ago
gragon.xu e7fa2f3abf NC,盘点交易处理组件 6 years ago
Jack.lv 972d2b04a7 wmshpak删除多余代码 6 years ago
Silliter 62196df6bf Merge remote-tracking branch 'remotes/origin/dev' into test 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 74b63d8a72 开发流程管家根据任务创建流程 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 8a58b48826 移库单主表去掉物料号,物料名称,数量属性 6 years ago
Silliter 0b56c38cba Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Jack.lv a8736a4747 新增、修改、查询 数据权限 6 years ago
Silliter de5760bba1 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Jack.lv c0be6489a3 bean修改 Warehouse 回退为原来的code 、 name 、address 6 years ago
Jack.lv 56568be77e bean修改 WmsHqlPack 同步pdm 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 e1825eac40 交易处理组件ALL 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
wei.peng 0a5c19ebe5 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
jimmy d289e7009a 增加移库移动明细表 已移库数量 6 years ago
Silliter cc4484a562 Merge remote-tracking branch 'remotes/origin/dev' into test 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
jessica.chen 0ce23f95b1 拆分组件修改 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
gragon.xu 3056922b15 POMasterDetails修改属性名whNo->erpWhNo 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
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
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
Silliter 3faba3bbc2 实体调整 6 years ago
Silliter 380f16943f 库位,条码服务创建 6 years ago
Silliter 8a78c19329 库位,条码服务创建 6 years ago
Silliter 73181f1c1a WMS实体对象重构,枚举修改 6 years ago
wei.peng 3fce943723 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter bb0eda58f4 流程管家调整 6 years ago
Silliter c45091584c Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
amy 879178697d # 6 years ago
amy b2f6b3255a 实体修改 6 years ago
Silliter dd11ff1e71 Merge remote-tracking branch 'remotes/origin/dev' into test 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 3f6b281912 发版 2018年12月28日 6 years ago
amy cbf734b0b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter a4d59caaeb Merge remote-tracking branch 'remotes/origin/dev' into test 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 3fcdba6c94 生产领料优化 6 years ago
amy 20cdd4170c 盘点状态实体枚举添加 6 years ago
Silliter cc3bb9e9ae Merge remote-tracking branch 'remotes/origin/dev' into test 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
wei.peng 38be37aad0 Merge branch 'dev' into test 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
wei.peng a1e69d404d Merge branch 'dev' into test 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