4756 Commits (9fc85191feff08b9a7aa0598b61527eff851222a)

Author SHA1 Message Date
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
袁津哲 f323637c94 Wms初始化扫描实体字段新增逻辑优化 5 years ago
jenkins b0bbf43a9b Jenkins自动合并 5 years ago
宋军超 5a24a08c00 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b0f60a9176 2020-01-08创建动态列表与查询model 5 years ago
钮海涛 68fc275565 修复资源甘特图拖拽问题 5 years ago
jenkins 75dc17f4c4 Jenkins自动合并 5 years ago
jokelone d0cd9d03b9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 0d7aca73a8 【需求:7315 生产工单变更】 5 years ago
王杰 54bdf8f6a0 JIS 5 years ago
e-jiawentao1 7b696d7e73 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
e-jiawentao1 a92090a3ab 2020-01-07创建动态查询与表单各层 5 years ago
e-jiawentao1 c51453a856 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
e-jiawentao1 9fbc120666 动态搜索与自定义列表初始化扫描Bean字段 5 years ago
jenkins 54d6d1f340 Jenkins自动合并 5 years ago
WYnneaoapc b1d030e0dd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 189bece3f7 Jenkins自动合并 5 years ago
e-jiawentao1 b2edab4ef4 2020-01-07创建动态查询与表单dao 5 years ago
e-jiawentao1 1dba90f768 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
e-jiawentao1 b939ce6625 2020-01-07创建动态查询实体 5 years ago
王杰 685d7949bf Merge branch 'dev' into test 5 years ago
zcg d8f6a5273c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 a2041a4900 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 7d63a933c0 生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家:加上可设置是否提交逻辑 5 years ago
zcg b84a305b26 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 497b963f60 Jenkins自动合并 5 years ago
王杰 bf62494236 JIS 5 years ago
jenkins fa4cc8610f Jenkins自动合并 5 years ago
puxiao.liao 8584946ce5 【 条码状态报表,导出时下列三个字段为中文
】bug7196
5 years ago
WYnneaoapc a9f2cf2501 task 1309 大数据检索 5 years ago
zcg c86f3e280e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 0a0124cd2b Merge branch 'dev' into test 5 years ago
jokelone c3a7e0057b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone fea1811191 【bug:7153 JIT排序】 5 years ago
王杰 4f8898d57a Merge branch 'dev' into test 5 years ago
王杰 bcec1d7e62 JIS 5 years ago
王杰 f88041df1e Merge branch 'dev' into test 5 years ago
王杰 3fe50125ae JIS 5 years ago
jokelone c226e61acf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg d9990f0cb8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins a685cd208d Jenkins自动合并 5 years ago
许心洁 267ec6c647 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng 823f818abf Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
许心洁 fe809e2eff 定时处理遗漏的待处理移动单JOB:处理周期改为可配置的JOB参数+流程管家:在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错 5 years ago
wei.peng 44af186f2f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg f2d73a0687 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 1995e55b40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 989e05c64c 【7168 对于发运单标签补打功能,根据发运单中的ship-to获取标签模板进行打印】 5 years ago
wei.peng d8d47541df 自定义报表调整 5 years ago
wei.peng af6083ddff 日志存储优化 5 years ago
jenkins c14ef88ea8 Jenkins自动合并 5 years ago
jokelone 68eb60c6cb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 74be235a26 修复资源甘特图拖拽问题 5 years ago
钮海涛 b0bbd132c6 修复资源甘特图拖拽问题 5 years ago
zcg f38e54e496 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 422aa1835f Jenkins自动合并 5 years ago
钮海涛 4013ed776b 修复炉资源排程问题 5 years ago
jenkins dfb06def2b Jenkins自动合并 5 years ago
曾贞一 9e9d3e2afa Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 5a4510cedb 【7168 对于发运单标签补打功能,根据发运单中的ship-to获取标签模板进行打印】 5 years ago
qianhs 81bab75132 【库存调整盘点需要修改为,扫描新的库位时就对上一个库位中的数据做调整(更新条码状态),每个库位的扫描数据还是存在同一张盘点单内,点击提交时该张盘点单关闭。去除页面上的未盘移库按钮,未盘条码直接做移库。】【bug7148 】 5 years ago
陈思洁 bae2130d72 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 1f1f6ec825 【KT-1346 增加拉动任务的暂停和开启】 5 years ago
WYnneaoapc 430e5ad6dd Merge branch 'dev' into test 5 years ago
WYnneaoapc 76c84631ab revise class name 5 years ago
WYnneaoapc adb4bd2a1c Merge branch 'dev' into test 5 years ago
puxiao.liao 0d2df2ec43 【 7194 Po明细导出,单据状态为中文
】bug7194
5 years ago
puxiao.liao a3a5e63baa 【 7194 Po明细导出,单据状态为中文
】bug7194
5 years ago
王杰 42a22d14d3 安灯导出字=字段冗余 5 years ago
许心洁 861f46323b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 7594b3d515 SAP取消指令:按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消 5 years ago
E a1276b5542 【#1338 库位物料中需要增加批量导入】 5 years ago
许心洁 a231651315 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 0a7f6ebf24 Merge branch 'dev' into test 5 years ago
WYnneaoapc cb7a1dea2a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 011b4d2205 zh20200101 现场问题修改 BI all 5 years ago
gcj b29347c409 【坤泰运输管理】 5 years ago
钮海涛 9627b6cf9e 修改资源甘特图侧边栏显示内容 5 years ago
jenkins 774e5015c6 Jenkins自动合并 5 years ago
钮海涛 2eb244c41c 修改资源甘特图侧边栏显示内容 5 years ago
许心洁 9a272f8b6a BUG#6755:移动单监听队列新增逻辑:如果当前处理的移动单的交易类型配置成需要推送异常邮件,并且全局参数“系统管理员”也有配置,则随送异常邮件 5 years ago
jenkins a104276c01 Jenkins自动合并 5 years ago
汪云昊 1cc4cacb5f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 b0b671aac0 软适配 数据源适配器优化 5 years ago
jenkins 688d976683 Jenkins自动合并 5 years ago
陈思洁 9f0a1e8ce0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 05efdbb568 【KT-1339 安全库存拉动,新增低于起订量概念】 5 years ago
王杰 8a4aa9fed2 jis发运 5 years ago
陈思洁 1e1e5e907e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 472adfd03c 【KT-1339 安全库存拉动,新增低于起订量概念】 5 years ago
jokelone ebe34e4ba9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 a76d70851d 软适配 适配记录参数 分页查询 5 years ago
zcg ad08ff21bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 569c2613fe Merge branch 'dev' into test 5 years ago
puxiao.liao f8e3edabc3 【 7159 线边退料逻辑错误,应该为:扫描A条码,输入原条码的剩余数量,拆包生成的新条码留在线边,原条码退回仓库。若数量与原条码相等,则不做拆包。
】bug7159
5 years ago
wei.peng 391d4005ad Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 028ae09f9c Jenkins自动合并 5 years ago
wei.peng f768247c4f 代码合并 2019-12-30 15:59:52 5 years ago
曾贞一 8b90b33e28 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 2da366630f 【VDA波次配料--物料汇总优化】 5 years ago
钮海涛 14f47f1ab4 修改字段编辑弹出框 5 years ago