1185 Commits (457e10bc75b5846271125ae06d73aa049c8368cb)

Author SHA1 Message Date
qianhs 457e10bc75 1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】 6 years ago
gaochangjiang 047b9d5e35 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gaochangjiang 02e3ac4960 【库存预警】bug 修复库存预警 6 years ago
jokelone 828cf66784 【需求:1090 工序BOM,物料绑定记录删除多余字段】 6 years ago
lpx 69be002972 【装箱防错】【301-4.2条码装箱防错】【1118条码装箱防错建任务】 6 years ago
汪云昊 86a18d730a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 9907813aed Lac调度实体 6 years ago
许心洁 bbec6a1002 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 7799937093 成功处理移动单写入MOVE_TO_ERP表:根据移动单号+行号+零件号查询是否已存在数据,是则将此数据标记为不同步且无效软删除 6 years ago
jokelone 438517be44 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
jokelone 6c847cf305 【需求:1091 返厂返修添加字段和枚举】 6 years ago
王杰 2069d6a3ae 【需求:1125,设备报表】 6 years ago
wei.peng f67a61ec92 网关 添加 APS 路由
BASE URL 路径优化
6 years ago
王杰 dcaf007f4d 【需求:1107,生产工单首检件】 6 years ago
jokelone bc13a8a3ac 【需求:1090 返厂返修增加分页查询】 6 years ago
jokelone a5609d97fb 【1092 返厂返修增加枚举】 6 years ago
crish 1e0f0c706c 安灯问题修复 6 years ago
crish f093a97cf0 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 4eaa8b5b17 导入导出 6 years ago
crish 6902c79472 问题清单问题修复 6 years ago
crish 7d8b8664cc 问题清单问题修复 6 years ago
王杰 56996126be 【需求:1101,mes同步设备安灯维修任务】 6 years ago
jokelone d0b98f0869 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 00e849a62e (1089 过程质量检测基础数据;1090 返厂返修基础数据) 6 years ago
crish e15e402890 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
lpx ca0cf21a7c 【NC解冻-4.2 组件复用】PR12-01~PR12-02 6 years ago
crish a537daee62 导出不导出有效性 6 years ago
qianhs caf6dc17ab 【NC冻结】nc冻结 6 years ago
王杰 09cff08e1e [需求1086,设备点检保养作业,第2次提交] 6 years ago
wei.peng 5e78c31a70 LAC 名称修改 6 years ago
WYnneaoapc 87ffdfd9a3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc ac7b0415ba 1083 添加枚举字段 6 years ago
汪云昊 5c67a7bb5f MySQL 数据库不支持 CAST AS DOUBLE,需要改成 CAST AS DECIMAL 6 years ago
王杰 fa25769c50 mes枚举 6 years ago
王杰 0d0178545c mes设备 6 years ago
WYnneaoapc e8336c85d7 idea 异常 文件格式化 6 years ago
jokelone 7139d9b5f1 解决冲突 6 years ago
jokelone 9e4930968f 解决冲突 6 years ago
jokelone 8a517bc0b9 返厂返修增加字段 6 years ago
crish 0fdabe4950 知识库 ,自处理开发 6 years ago
crish 9f9874902d 冲突解决 6 years ago
曾贞一 e603ac66a7 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 5a036f14cb mes设备作业任务 6 years ago
jokelone 7fc439319e 返厂返修 6 years ago
陆卫豪 413266293e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 030391a93c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 56d7457826 工位监控提交 6 years ago
曾贞一 5e7fb00d0c 【生产领料】 6 years ago
许心洁 1f1b4f7511 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 48a6cdc39c 作业任务:作业类型 枚举增加 6 years ago