3786 Commits (68f31721f06a576f52094ec82b83c784134a0981)

Author SHA1 Message Date
汪云昊 68f31721f0 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 c60213ad3e Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 2ad6d16684 参数重复校验错误 6 years ago
qianhs d4422bee15 【 PO订单页面,点击查询后,过滤条件错误,导致数据显示异常】【bug6493】 6 years ago
王杰 7a023d0f4b Merge branch 'dev' into test 6 years ago
王杰 fe962c1ab3 【bug:6483】 6 years ago
王杰 3c3de49512 【bug:6483】 6 years ago
钮海涛 407fdbf217 修复对象关联删除出错问题 6 years ago
王杰 e5db689881 Merge branch 'dev' into test 6 years ago
王杰 85e35eede1 解决冲突 6 years ago
汪云昊 f95482501b Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 efea8980e7 解除冲突 6 years ago
汪云昊 5a2a2a5e8d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
 Conflicts:
	modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
6 years ago
jenkins 092f72872b Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
wei.peng 4b17995206 LAC 日志记录Cache 完成 6 years ago
王杰 6297ccc4d7 Merge branch 'dev' into test 6 years ago
jokelone 5e813f30e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone f632308d0a 【任务:1193接口数据解析】 6 years ago
王杰 2a5c32b8ea 解决冲突 6 years ago
陈思洁 5050c0c5a1 新增实体--安全库存 6 years ago
qinjia zou 2210482918 【自动入库】bug6390 6 years ago
汪云昊 13f77e69c1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 02a9c64a42 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
qinjia zou a8ebcb669b 【自动入库】bug6390 6 years ago
qinjia zou 6e8977e5aa 【自动入库】bug6390 6 years ago
钮海涛 e3ba4f6349 新增规则组合执行接口 6 years ago
jokelone e046553788 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 987a502d7e 【bug:6380 物料字段拼写有误】 6 years ago
陆卫豪 82fd56dc68 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 12a66262be 解决冲突 6 years ago
WYnneaoapc fdd051f2dd 打印修复 6 years ago
jenkins f76aaddbd5 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
qianhs a55795d43f 【 VDA收货---预收货的单据,要在页面上可以查询】【bug6465】 6 years ago
qianhs f0b35d1d74 【VDA生产退料-条码所在库位-需为线边库位】【bug6442】
【VDA收货---选择ASN订单,点击预收货,预收货成功后,按钮还可以点击。导致数据重复】【bug6464】
【	VDA收货---预收货的单据,要在页面上可以查询】【bug6465】
6 years ago
jenkins 4d2a2a35b0 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 339a12eba3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 3781713a29 实时库存-条码明细优化查询速度 6 years ago
于学杰 9e625acc0d 1. MOVE_TO_ERP 增加是否预收货字段 6 years ago
曾贞一 3ba4e9b4f1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 28078287af 【VDA收货】【预收货的单据,要在页面上可以查询-bug6465】 6 years ago
王杰 f6d50bdfb7 【需求:1167,产品批量打包】 6 years ago
王杰 693ac2451e 【需求:1167,产品批量打包】 6 years ago
于学杰 71818c4745 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 db9a698c68 1. 增加是否寄售的属性 6 years ago
jokelone 4cec8e8ac8 【任务:1193接口物料拆解增加工位字段】 6 years ago
汪云昊 b4976be85e LAC执行流程调试
UA订阅次数问题
6 years ago
王杰 1a7164c474 Merge branch 'dev' into test 6 years ago
王杰 b15c3f4ae7 【需求:1101,定时任务优化】 6 years ago
jokelone 9ca2760866 【任务:1193接口repository】/s 6 years ago
jokelone 9842ed2181 【任务:1193接口pojo】 6 years ago