4756 Commits (9fc85191feff08b9a7aa0598b61527eff851222a)

Author SHA1 Message Date
luweihao 4ae13f8270 task `1408` 生产数据结构化 5 years ago
jenkins cf44b8866a Jenkins自动合并 5 years ago
钮海涛 9e0158e749 修改test分支POM配置 5 years ago
jenkins c90df4e96a Jenkins自动合并 5 years ago
许心洁 28ce8615fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 51d60a107a SAP指令锁定逻辑修改:
根据单号查询(之前:任务明细;现在:单据明细)获取行号记录到sap_order_lock表;
原因:SAP要的是单据的行号,任务明细可能是单据明细的拆分或者合并所得,行号不一定准;
5 years ago
jenkins f927ee21ac Jenkins自动合并 5 years ago
王杰 bf71cd07d0 JIS发运 5 years ago
jenkins 7e6f83a974 Jenkins自动合并 5 years ago
陈思洁 babc158ed6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 5feae0dd1a 【1405 物流路线在物品分类及仓库级别的应用】 5 years ago
陈思洁 09339a6e1f 【1405 物流路线在物品分类及仓库级别的应用】 5 years ago
jenkins a3823f4a16 Jenkins自动合并 5 years ago
袁津哲 2d30f2da0f Wms动态搜索与自定义列表,表单开发 5 years ago
wei.peng b199c5995f Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test
# Conflicts:
#	modules/i3plus-ics-console/src/main/resources/application.properties
#	modules/i3plus-ics-gateway/src/main/resources/application.properties
#	modules/i3plus-ics-regist/src/main/resources/application.properties
5 years ago
jenkins 134757c92b Jenkins自动合并 5 years ago
wei.peng 32d715a29c APS 调用失败bug 修复
动态报表 下拉问题修复
5 years ago
宋军超 964afe73cd 2020-01-16 16:42 添加自定义列枚举 5 years ago
宋军超 ed5a3b5acd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 851067b8d2 2020-01-16 16:37 自定义列表优化 5 years ago
jenkins d790bcf355 Jenkins自动合并 5 years ago
luweihao 4275e1d537 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 6ec43ea151 task `1392` 修正索引 5 years ago
袁津哲 67ef5c5516 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 89a7cafee4 Wms动态搜索与自定义列表,表单开发 5 years ago
luweihao 85675cdad6 Merge branch 'dev' into test 5 years ago
luweihao 88d1e39578 压测计时 5 years ago
jenkins 33e68b7e9f Jenkins自动合并 5 years ago
wei.peng cb68f62e46 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng 8a4974f369 自定义报表 调用调整 5 years ago
jenkins 6371e8df60 Jenkins自动合并 5 years ago
袁津哲 f7c98e3982 Wms动态搜索与自定义列表,表单开发 5 years ago
jenkins a19cace3b1 Jenkins自动合并 5 years ago
puxiao.liao 86b73d43f9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 6f82fa17fd Jenkins自动合并 5 years ago
许心洁 889c6ac548 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 7f7c9ebf6e SAP指令锁定组件逻辑修改:若根据单据号查询到了记录则不再新增了,并且调用此组件时缓存中一定得存在ORDER_NO;
定时重推待处理移动单入JOB容错结构修改+留个SWAGGER接口
5 years ago
qianhs a1ec8d7293 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins da70df25ac Jenkins自动合并 5 years ago
puxiao.liao 347197f305 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao b64327831a 【 7402 收货回执界面,查询条件增加一个ASN组号,显示列表中也增加一个ASN组号
】bug7402
5 years ago
jokelone 3f0646403f 【bug:7408报表优化1】 5 years ago
王杰 2f5b9954d0 Merge branch 'dev' into test 5 years ago
jokelone 68e7dc8906 【bug:7408报表优化】 5 years ago
luweihao 55fad978a6 Merge branch 'dev' into test 5 years ago
钮海涛 9e34d99d9e 修复资源甘特图拖拽问题 5 years ago
jenkins 69ff58a67e Jenkins自动合并 5 years ago
qianhs 61303a9f38 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins 002ce795f4 Jenkins自动合并 5 years ago
luweihao 01a694be70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 6baeeee71e task `1392` 调整工步 错误处理实现 5 years ago
jenkins 458137d216 Jenkins自动合并 5 years ago
许心洁 c2ba0a5663 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 fff79a7846 GROUP_COMMIT_MODE枚举漏提交 5 years ago
jenkins e967001c75 Jenkins自动合并 5 years ago
许心洁 cb7f868d64 任务#1403 流程isCommitRefMove属性改为commitMode 5 years ago
许心洁 0e54d9a5b6 任务#1403 流程isCommitRefMove属性改为commitMode 5 years ago
袁津哲 ad8e51dfae Wms动态搜索与自定义列表,表单开发 5 years ago
jenkins c1609539cf Jenkins自动合并 5 years ago
许心洁 8eb74cef4d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 8c0b298cfe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone fd1a0ebdb8 【任务:1404 过程质量 检查项类型分组展示】 5 years ago
许心洁 de0d57179c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 35839db806 BUG#7359 任务列表分组字段和移动单赋值逻辑更改 5 years ago
jenkins 006fd3aef3 Jenkins自动合并 5 years ago
曾贞一 3a9e719005 【vda收货时,是否分组提交】 5 years ago
jenkins 8f6b53c5ea Jenkins自动合并 5 years ago
wei.peng 3e31641b20 PTL 项目初始化
PTL PCN 项目初始化
5 years ago
wei.peng e1dd7c3cdd PTL 项目初始化 5 years ago
jenkins 274011537c Jenkins自动合并 5 years ago
luweihao 325399127e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 28587fbb98 task `1392` 调整工步 错误处理实现 5 years ago
qianhs f1afdf92e9 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins 24f9ed25c2 Jenkins自动合并 5 years ago
qianhs 9d744318cd 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins a0b67a3723 Jenkins自动合并 5 years ago
袁津哲 8285c87624 Wms动态搜索与自定义列表,表单开发 5 years ago
jokelone 2d8b55b61a 【现场优化:59 过程质量】 5 years ago
jokelone 64f4486924 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 8ef70ed627 【现场优化:59 过程质量优化】 5 years ago
jenkins 16a414192f Jenkins自动合并 5 years ago
曾贞一 c543043da5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 328f2e64c5 【同批次修改】 5 years ago
qianhs 2eb14492d4 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins 7057c685cc Jenkins自动合并 5 years ago
zcg 2396863bab 【任务:1383 数据监听定时数据抓取】 5 years ago
E c7a2c79f26 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 64438ac61c Jenkins自动合并 5 years ago
qianhs 41047a17c1 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins 8e168c5109 Jenkins自动合并 5 years ago
袁津哲 ff4cd68e89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 c2e66de638 Wms动态搜索与自定义列表,表单开发 5 years ago
袁津哲 86694d3ceb Wms动态搜索与自定义列表,表单开发 5 years ago
wei.peng 503f3cd7a3 自定义表单功能优化 5 years ago
曾贞一 582115f999 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 5c841c706b 【7201 收货BOP移库流程图】 5 years ago
jenkins e88b93a22c Jenkins自动合并 5 years ago
gcj 8245950fd3 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
gcj 51c66e9279 【宁德问题清单】 5 years ago
jenkins 8d614aef8d Jenkins自动合并 5 years ago
陈思洁 1e0a0ff4fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 c24de431d4 【6853 数据迁移:产品报工明细表、产品发运表、产品入库表。定期迁移。】 5 years ago
曾贞一 c3ad3d260a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 3d7f88d2ee 【7201 收货BOP移库流程图】 5 years ago
gcj 8414af2011 【按规则推送邮件】 5 years ago
gcj 890b094e15 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj 7090f30b94 【按规则推送邮件】 5 years ago
jenkins 782574c73d Jenkins自动合并 5 years ago
袁津哲 29220002b1 Wms动态搜索与自定义列表,表单开发 5 years ago
jenkins 56e53906ec Jenkins自动合并 5 years ago
袁津哲 73e8287e1f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 cf92fb2b23 Wms动态搜索与自定义列表,表单开发 5 years ago
jokelone f1096e9ec5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 51839d7be5 【任务:1381】 5 years ago
zcg 0a8385495e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg add40a27e3 【任务:1382,数据监听基础模块开发】 5 years ago
qianhs 241350ae83 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
E 0cc70fe2d0 【#1390 基础数据-客户信息增加导入功能】 5 years ago
jenkins b71be613fc Jenkins自动合并 5 years ago
WYnneaoapc ded27853a8 task 修改生产数据 5 years ago
jenkins 3db9a86504 Jenkins自动合并 5 years ago
袁津哲 fc19275ef0 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 4e0f40042a Wms动态搜索与自定义列表,表单开发 5 years ago
陈思洁 b0065bd650 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 fa576d7a6d 【6847 开发执行异常的预警报表。存在处理异常数据时,提供报表展示。盘点前所有异常数据均需处理完成】 5 years ago
王杰 031d57e081 JIS 5 years ago
jenkins ebcde1d16b Jenkins自动合并 5 years ago
jokelone c905343349 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 0a70a42336 【任务:1381 兼容Sql server】 5 years ago
jenkins fe71007a5c Jenkins自动合并 5 years ago
袁津哲 42bbb852c4 Wms初始化扫描实体字段新增逻辑优化 5 years ago
汪云昊 536200cf2b Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
袁津哲 2f2f24356c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 daf3365ce3 Wms初始化扫描实体字段新增逻辑优化 5 years ago
gcj cbe87c6bd7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj c14d6c6916 【宁德问题清单】 5 years ago
宋军超 d05fd542b3 2020-01-08添加列表菜单与对应和关系逻辑 5 years ago
袁津哲 e5138ac4e9 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 e1386275d0 Wms初始化扫描实体字段新增逻辑优化 5 years ago
宋军超 b9f3ea144f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 bca93691ba 2020-01-08添加列表菜单与对应和关系逻辑 5 years ago
陈思洁 99f79ee5db Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 25606ea25a 【6847 开发执行异常的预警报表。存在处理异常数据时,提供报表展示。盘点前所有异常数据均需处理完成】 5 years ago
袁津哲 29f785ed35 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 7d4ba10449 Wms初始化扫描实体字段新增逻辑优化 5 years ago
jenkins ae8475de5d Jenkins自动合并 5 years ago
许心洁 2f90982e68 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 c53c8c04e3 BUG#7186 5 years ago
jenkins 852be5a130 Jenkins自动合并 5 years ago
袁津哲 76b5087e60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago