1674 Commits (08125e3b0f87b975129302cd058db8f6f32321af)

Author SHA1 Message Date
joke.wang 63b7162932 mgn-bj 半成品看板 5 years ago
汪云昊 dceb9b17a5 revert(pojo):还原pom版本 5 years ago
汪云昊 91f68d50d4 Merge remote-tracking branch 'origin/dev' into test 5 years ago
宋军超 692cd283f7 添加天津涂装看板-设备实时监控 5 years ago
曾贞一 d8e5aa44bc pom.xml 5 years ago
陈思洁 8dfcb7f429 【合并冲突】 5 years ago
陈思洁 3dc951c34f 【11964 19048-喷涂抛光报表变更-20201021】 5 years ago
宋军超 37c95dc6b3 添加天津涂装看板 5 years ago
wynne1005 20ee1215d2 解决 包名细化 导致冲突 5 years ago
wynne1005 9d81ec30d1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6d4e8608c4 注塑 组装报表开发完毕 5 years ago
joke.wang f57f4e25be mgn-bj 总屏看板 5 years ago
宋军超 1b6264e80d 添加天津涂装看板 5 years ago
songss 2ed5108699 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 36928196c1 中航看板-调整返回接口参数 5 years ago
joke.wang 5227540ecc 队列表添加索引 5 years ago
songss d9040143f9 新增中航产线看板-每小时产量接口 5 years ago
wynne1005 1730dc27c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4d4ad7ff84 天津注塑看板 5 years ago
songss 783022646c 新增中航产线状态图接口 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 5 years ago
王杰 f6ad2824b2 11984 19048-组装生产计划报表增加字段-20201020 5 years ago
王杰 97be3f186a 工单生产时间变更定时任务实体 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
宋军超 6826f04b97 天津看板添加设备状态逻辑 5 years ago
joke.wang 9002bdc936 预装队列显示列优化 5 years ago
王杰 bb3039d1f2 包装关系查询宝贝 5 years ago
songss 17d47fdc55 新增看板图片增删改查接口
新增看板切换配置增删改查接口
新增中航-产线概况接口
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
贾文涛 525cda2768 增加数量处理方法 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
wynne1005 5d73afd17f jisa小时接收报表完成 5 years ago
wynne1005 05152538b2 合并冲突 5 years ago
wynne1005 fc36e55a38 新增mes 报表查询周期枚举 5 years ago
宋军超 9c1a9be165 优化天津麦格纳报表 5 years ago
wynne1005 e24bb4c39b 同步新增忽略字段 5 years ago
wynne1005 63c1cc479b 字段长度 model添加planCfgCode 5 years ago
wynne1005 7bca216063 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 8b53722b0f 设备plan更新 5 years ago
joke.wang cd32eee8ea 排程配置表增加冗余字段 5 years ago
宋军超 fcc66835b8 开发天津看板功能 5 years ago
wynne1005 ddaedf49ee Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 52bdc6c664 设备作业周期 新增planCfgCode 5 years ago
宋军超 bd9547b825 优化天津麦格纳报表 5 years ago