1642 Commits (92a9f5fabafd483aee630b9b00222befdeb5456d)

Author SHA1 Message Date
陈思洁 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
joke.wang cc2961d4b8 库存排产表增加字段 5 years ago
宋军超 3d8d84ee77 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
 Conflicts:
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
5 years ago
宋军超 dc38d2db6f 优化天津麦格纳报表 5 years ago
wynne1005 1e6ca2e0bb 添加设备作业任务 周期类型 5 years ago
贾文涛 1ffebd418f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 834e3d211d 更新查询大于0的业务时,基础类错误问题。 5 years ago
wynne1005 a86a58fa6d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 233853e1e6 库存排程 5 years ago
王杰 f58d97fb83 11777 19048-绑定关键件 绑定多个关键件数据出现回滚-20201012 5 years ago
wynne1005 248c8229ff Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 a49ddc004c 添加lob 5 years ago
贾文涛 0c34bce623 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 7e24f4ed4a 修复队列乱跳问题。 5 years ago
贾文涛 d2f9c3502a 修复队列乱跳问题。 5 years ago
wynne1005 18275c8fb2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 226c31878a 添加缺陷代码 5 years ago
陈思洁 30f8e332fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8f060d4aa4 【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】 5 years ago
joke.wang c442845f94 跳序变更 5 years ago
wynne1005 7fb7db3cb5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 629e6af9a9 设备指导操作文件 5 years ago
宋军超 4b65842d6f 修改天津麦格纳项目问题 5 years ago
wynne1005 ebf0392057 去除多余optionType枚举 5 years ago
wynne1005 470775b527 备件生成冲突解决 5 years ago
wynne1005 f52f07fe77 备件导入 5 years ago
王杰 6f3f06a8f6 19048-条码补打-补打包装需要可以用过程条码反查包装条码-20201012 5 years ago
wynne1005 d36a7527a6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 c117515b69 设备自动报警 5 years ago
songss 966ed3536b Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
songss 5816f275bf 新增控制计划相关接口 5 years ago
钮海涛 1695d75ff2 合并dev代码 5 years ago