1521 Commits (7863325afdf746d494d223acee78ba71524a0af0)

Author SHA1 Message Date
许心洁 7863325afd 本地误拉了测试的代码,还原后提交,在测试分支拉开发分支的代码也得还原 6 years ago
许心洁 b7b78b85ac 误拉了test分支的代码:还原 6 years ago
刘辉 83a7a9e988 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
changjiang.gao 9e1b86eb2b 导出显示bug修改 6 years ago
许心洁 8deff73454 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
changjiang.gao 647508d92c 导出显示bug修改 6 years ago
刘辉 722146acd8 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
bleakney.liu 29fee6b028 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
bleakney.liu 746a04f96d 代码格式优化 6 years ago
许心洁 6fc4474699 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lbwgithub a4d873f36f 添加过滤条件 6 years ago
许心洁 04cdf58aef Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lbwgithub abd2321850 格式化代码 6 years ago
许心洁 89ab1816e3 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lbwgithub 71a68e8cf6 枚举 6 years ago
王杰 18bc35f60d Merge branch 'dev' into test 6 years ago
lbwgithub 473e2caea0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
lbwgithub 2cf4759c21 枚举 6 years ago
刘辉 60d1798b9c Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 0bdc3592e2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 f67e7df17f 新增冗余字段 6 years ago
曾贞一 320c7f6b1f 【生产快速入库】生产快速入库导入接口 6 years ago
曾贞一 9d3b45d2e2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 ddd91f51b5 【生产快速入库】组件选择,任务编号1051 6 years ago
许心洁 232c675444 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 84a96a22fa 新加NotNumBiggerPackContainsZero方法 6 years ago
许心洁 1b5df102e7 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 95f156adf4 所有double类型的属性都要加上精度注解,否则数据库中自动生成的类型为double 6 years ago
许心洁 1a7b4e3438 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘辉 1defd0d8be Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 113bb8755d 解决冲突 6 years ago
陈思洁 4ac7bae38b 新增hql 6 years ago
bleakney.liu 0fa1ffa23b [物流线路修改]修改数据类型 6 years ago
bleakney.liu f682d056be [物流线路管理]修改查询条件 6 years ago
许心洁 653c8dca1f 直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误 6 years ago
曾贞一 2b62357ab5 VDA收货【生产快速入库】组件,任务编号1051 6 years ago
许心洁 10fcc569bd Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 e90c59ccf2 生产报工当查询到多条子物料时查询的SQL没有返回itemQty 6 years ago
许心洁 e35cf183da Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lbwgithub 4fc72ca358 条码模型 6 years ago
lbwgithub 81d86d1bd2 条码模型 6 years ago
jenkins 99382a8fca Merge branch 'dev' into test 6 years ago
曾贞一 c509f3c707 VDA 生产快速入库 6 years ago
jenkins 0982f01eb2 Merge branch 'dev' into test 6 years ago
陈思洁 26684524f1 生产报工组件和生产报工标签组件提交 6 years ago
jenkins 7e3edd06a0 Merge branch 'dev' into test 6 years ago
陈思洁 3ba6508b0c 新增打印机配置表 6 years ago
陈思洁 22fbbe2a91 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 edfc78995b 新增打印机配置表 6 years ago
刘敏 8a94b054d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago