1170 Commits (9907813aed1a5256655c2b1d757a577d7ec067a9)

Author SHA1 Message Date
汪云昊 9907813aed Lac调度实体 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
crish e260045c42 Merge remote-tracking branch 'origin/test' into test 6 years ago
crish 97763d6b53 安灯广播, 安灯管理显示不同界面, 添加操作来源字段 6 years ago
王杰 b561110e54 Merge branch 'dev' into test 6 years ago
王杰 9cc89f9397 mes设备周期计划 6 years ago
许心洁 2f843a8f5a Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 986157043d 流程设计:新增组件参数类型:可配字符串 6 years ago
王杰 611b25abfd Merge branch 'dev' into test 6 years ago
汪云昊 d91fa61c88 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 6c1891c193 软适配报文状态及微服务接口调整 6 years ago
wei.peng 05fd0fe686 WebService Server 优化完成 6 years ago
许心洁 7863325afd 本地误拉了测试的代码,还原后提交,在测试分支拉开发分支的代码也得还原 6 years ago
许心洁 b7b78b85ac 误拉了test分支的代码:还原 6 years ago
许心洁 d351c36ffc Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc c681340355 工位监控添加枚举一字段 6 years ago
汪云昊 52a5fe74af Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago