910 Commits (9232010d60b95ad43a4153fa1be329dd5e1d49b4)

Author SHA1 Message Date
jenkins 9232010d60 Merge remote-tracking branch 'origin/dev' into test 6 years ago
sky.meng 8409025253 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into stock_report
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
6 years ago
sky.meng a67f88a4bb 库存报表开发 6 years ago
jenkins 9848ca9c90 Merge remote-tracking branch 'origin/dev' into test 6 years ago
曾贞一 beb2285591 移库单业务逻辑修复 bug#4495 6 years ago
曾贞一 ca625dbfcc 开发 交叉盘点业务,新建盘点范围表,盘点调差范围表 6 years ago
于学杰 c3ff60a581 1. 解决 WMS 数据权限查询时多个值覆盖的问题 6 years ago
jenkins f75a861d05 Merge remote-tracking branch 'origin/dev' into test 6 years ago
shiyanghuan b871b34dba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
shiyanghuan 54d7190bf0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
6 years ago
陈思洁 be8c20fc45 收货回执单据打印修改--ASN订单冗余标准包装字段 6 years ago
shiyanghuan 1ad24c40f1 增加供应商物料信息 6 years ago
陈思洁 821afdd75b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 fbfba84ab0 冗余业务字段数据
修改任务明细查询方法
6 years ago
jenkins 06892a9c99 Merge remote-tracking branch 'origin/dev' into test 6 years ago
刘敏 b6b6ca8c1e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 1eda68e151 sap接口实体新增 6 years ago
jenkins 3969a8c7f2 Merge remote-tracking branch 'origin/dev' into test 6 years ago
许心洁 ec158d9bdf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 d3431028d7 StockQuan表新增ScrapQty字段:NC,盘点调差,出入移库交易处理组件+控制台逻辑变动 6 years ago
于学杰 45cd34f067 1. SAP - WMS 接口 POJO 类中增加 groupName 属性 6 years ago
于学杰 804fd91527 1. 完善 SAP - WMS 接口 6 years ago
Chnx a9f33764b2 po订单主表箱数默认0 6 years ago
jenkins e2556fa455 Merge remote-tracking branch 'origin/dev' into test 6 years ago
刘敏 6546ae1562 要货计划实体新增 6 years ago
jenkins 884d4fd763 Merge remote-tracking branch 'origin/dev' into test 6 years ago
刘敏 77e2d1e3ec 物料表字段新增 6 years ago
jenkins fd7abde050 Merge remote-tracking branch 'origin/dev' into test 6 years ago
Chnx f12e480ff7 po订单表添加箱数字段 6 years ago
jenkins ac8b9d3986 Merge remote-tracking branch 'origin/dev' into test 6 years ago
于学杰 c90d70e54f 1. 完善 SAP - WMS 接口程序 6 years ago
许心洁 29605d0c37 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 5ef906d88f 交易处理组件去掉生成收货入库单逻辑+新增公共初始化组件+任务生成去掉调试邮件+作业步骤参数类型查询条件去掉工厂+交易类型对象去掉作业类型编号属性 6 years ago
于学杰 9b6e8bf921 1. 修改拼错的单词 6 years ago
于学杰 65ddc6f57a 1. 完善SAP WMS 接口 6 years ago
jenkins 201d5cffee Merge remote-tracking branch 'origin/dev' into test 6 years ago
曾贞一 ba23663011 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 db7b849f3e 添加 移库单主表字段 6 years ago
于学杰 65efb44dde 1. 把默认值的类型改为 Object 6 years ago
shiyanghuan 3c5dea23fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
shiyanghuan 37eb33bcad 线边库实体以及WmsHqlpack中添加sql封装 6 years ago
陈思洁 6fb0abcadd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 cbb658e088 冗余字段新增 6 years ago
jenkins 373bbfaa98 Merge remote-tracking branch 'origin/dev' into test 6 years ago
许心洁 052652dd36 交易处理组件(收货):物料查询没有加工厂+流程设计:步骤调用参数值可以为空+作业处理组件:未修改不需要唯一校验 6 years ago
许心洁 4261207e54 交易处理组件(收货):物料查询没有加工厂+流程设计:步骤调用参数值可以为空+作业处理组件:未修改不需要唯一校验 6 years ago
jenkins 5fc6ac8006 Merge remote-tracking branch 'origin/dev' into test 6 years ago
于学杰 b4e0effcb0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 46a361a291 1. 增加 SAP - WMS 接口转换实体类 6 years ago
jenkins 25fc477991 Merge remote-tracking branch 'origin/dev' into test 6 years ago