7613 Commits (62d5d62cef5d58e87c9188bfd6d24eed27f7f75c)
 

Author SHA1 Message Date
puxiao.liao 62d5d62cef 北京MGN系列BUG修复 5 years ago
songss 95936d40fe Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 783022646c 新增中航产线状态图接口 5 years ago
rock.yu a953523245 增加 ERP 快照相关表 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 5 years ago
钮海涛 1037ad6e68 修复问题 5 years ago
puxiao.liao 3de97d5b98 北京MGN系列BUG修复 5 years ago
王杰 22accd397f Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
王杰 f6ad2824b2 11984 19048-组装生产计划报表增加字段-20201020 5 years ago
王杰 7fcbf3f4e2 :wq
erge remote-tracking branch 'i3plus-pojo/test' into test
5 years ago
puxiao.liao 6907ab6dc0 北京麦格纳看板需求 5 years ago
王杰 97be3f186a 工单生产时间变更定时任务实体 5 years ago
钮海涛 0e75cde494 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 63a06fcc27 修改供应商端登录及供应商端代码重构 5 years ago
陈思洁 a6acf3d616 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 82a769cae1 【12040 19073-安灯BI界面中事件物料时长,解决时长为-3290,解决在横坐标的下方有问题-20201026】
2887 10 2.3.7安灯通知优化
5 years ago
puxiao.liao 0216cf59c4 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 051417c10e 北京麦格纳看板 5 years ago
钮海涛 ef7a20a719 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 505de36ca5 修改SWeb供应商登录接口 5 years ago
songss ef316af0c1 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
5 years ago
wynne1005 78a3943a3d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c86b836ca OP20b逻辑变更 esop展示变更 5 years ago
汪云昊 15dc4b00c7 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 ed22bd6f64 feat(form):存储过程调用适配mysql,mssql 5 years ago
puxiao.liao 56deedeaf3 北京麦格纳看板 5 years ago
puxiao.liao c965a34236 北京麦格纳看板 5 years ago
puxiao.liao ba81af744b 北京麦格纳看板 5 years ago
宋军超 6826f04b97 天津看板添加设备状态逻辑 5 years ago
joke.wang 9002bdc936 预装队列显示列优化 5 years ago
王杰 dda9763a75 Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
王杰 bb3039d1f2 包装关系查询宝贝 5 years ago
songss 17d47fdc55 新增看板图片增删改查接口
新增看板切换配置增删改查接口
新增中航-产线概况接口
5 years ago
贾文涛 9a4964222c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 2301e03c85 增加呼叫不需要弹窗的枚举。 5 years ago
陈思洁 92a9f5faba Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b70a58ba7d 【2867 10 2.3.9 返工返修批量作业】 5 years ago
songss 3e629e63c5 控制计划-过程检验逻辑调整 5 years ago
wynne1005 9629823a79 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 b00bcf66b2 图片展示类型 5 years ago
贾文涛 00e27023c1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 525cda2768 增加数量处理方法 5 years ago
puxiao.liao ceb882cef4 天津MGN修复BUG 5 years ago
puxiao.liao 4ca43f81cc 北京麦格纳JIS发运看板 5 years ago
钮海涛 8346aa3fae Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 66c55386ee 修复sweb的bug 5 years ago
宋军超 627e8ac215 添加麦格纳看板相关基础数据 5 years ago
陈思洁 061f48dc79 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e268ed86a9 【11934 19081-工位BOM中需要增加产线和工位的查询条件-20201020】 5 years ago