385 Commits (e37653c544ae167972832706e2d382524df2d505)

Author SHA1 Message Date
王杰 09cf450156 Merge branch 'dev' into test 6 years ago
crish 4d3adf5daf Merge branch 'dev' into test 6 years ago
汪云昊 f0e77305dd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 3856a6d600 LAC调整微服务指令集操作方式
OPC UA工具订阅方式调整
6 years ago
曾贞一 ff1f561b9d 消息样式实体类 增加一条 6 years ago
王杰 ac5432bebb 解决冲突 6 years ago
jenkins 8eb8c2f97e Merge branch 'master' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 9f9c095846 Merge branch 'dev' into test 6 years ago
汪云昊 c4ed0f1f37 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 12ba5d2ff3 lac微服务模式优化 6 years ago
王杰 a595fed4fe Merge branch 'test' 6 years ago
汪云昊 c0d8375d0f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 8d6a2b53b1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 b7c6189308 生产汇报JOB优化(新增根据多个属性值将对象集合进行分组的公共方法)+标准收货速度优化(30%) 6 years ago
王杰 64d631c180 Merge branch 'test' 6 years ago
汪云昊 f95482501b Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish 410558d43c Merge branch 'test' 6 years ago
汪云昊 7cb9ffd37b Lac细节优化
OPC调整
6 years ago
陆卫豪 3fa5437c5a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 360f908ae4 获取生产数据 6283 6 years ago
许心洁 208410340e Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
张哲铭 6871e96496 Merge branch 'dev' into test 6 years ago
许心洁 5dc8ffb394 日志处理队列V1.0 6 years ago
crish c4d7a2380c Merge branch 'test' 6 years ago
许心洁 9755e5f751 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
wei.peng da7ba77dab LAC 跨服务调用软适配接口完成 6 years ago
王杰 d2c7a81893 Merge branch 'dev' into test 6 years ago
汪云昊 154bba4b3b LAC 调度模式优化 6 years ago
王杰 2417b40635 Merge branch 'dev' into test 6 years ago
汪云昊 cfd7f5276e 实体调整 6 years ago
许心洁 9c54b2561c Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
汪云昊 50bf9300ba LAC 调度模式完成 6 years ago
王杰 7291a7a85c Merge branch 'dev' into test 6 years ago
汪云昊 86a18d730a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 9907813aed Lac调度实体 6 years ago
王杰 9446a76159 Merge branch 'dev' into test 6 years ago
wei.peng aeff042046 添加 组织代码查询 6 years ago
许心洁 c79786a677 合并开发分支的代码POM文件被改成DEV修改回TEST 6 years ago
crish 18161e8191 Merge branch 'test' 6 years ago
WYnneaoapc 3dbbee3c60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 3bc277178e Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish 3e9cc95017 pojo-model加入andon-pojo依赖 6 years ago
crish 2906667856 mes定时获取安灯安灯任务信息 6 years ago
WYnneaoapc b47f97fa05 1050-2 工位监控 6 years ago
许心洁 77fefbcf74 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 5956d5a08e 冲销:需求变更优化 6 years ago
crish 15e812c7a6 Merge branch 'test' 6 years ago
许心洁 02055a8b7e Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 18789939b0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 0526da8ee3 Merge branch 'test' 6 years ago