I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,735 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ebbb1b9f34'
${ noResults }
Commit Graph

430 Commits (ebbb1b9f348d11fb0c56985c173ef91255f8b0f0)

Author SHA1 Message Date
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 5 years ago
陈思洁 82a769cae1 【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】 
2887 10 2.3.7安灯通知优化
 5 years ago
songss 9c1965ea6c 11653 19073 安灯导入模板调整 5 years ago
陈思洁 a3100a71e5 【9666 19073-安灯报表：工位统计报表-删除班次、设备。添加故障时长-20200721】 5 years ago
汪云昊 171f39cf01 revert:还原pojo pom.xml报表 5 years ago
汪云昊 56bd07dbf3 Merge remote-tracking branch 'origin/dev' into test 5 years ago
陈思洁 604c1443ca 【三色灯控制信息基础页面增删改查】 5 years ago
钮海涛 543058b3a5 合并sweb代码 5 years ago
陈思洁 b8e34a34b5 【11561 19081-安灯pushPLC控制三色灯-目前未控制具体工位-20200924】 5 years ago
钮海涛 5c104e036f 合并test代码 5 years ago
陈思洁 a9b18733ec 【11218 19081-安灯系统增加PLC交互控制三色灯-20200910】 5 years ago
汪云昊 163d0773a9 修改pom文件版本 5 years ago
钮海涛 485c66aaf7 合并test代码 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 d47607880e 合并冲突 5 years ago
宋军超 b0aba21859 中航导入问题修复 5 years ago
宋军超 b7542f8db0 修改中航问题 5 years ago
joke.wang bd8cc364c1 jsp计算优化 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
joke.wang 562ba3e339 增加按灯停机时长接口 5 years ago
汪云昊 bda160ccec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
王杰 772229b983 andon 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
王杰 03dbb18bb8 8832 PO-HJMGN-19073--TJX5没有设备信息，但是显示了新松线的设备信息。--20200609 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
王杰 08cce22dbb dev merge test 5 years ago
王杰 0e3614eb68 test merge dev 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
王杰 9b56c6d9bf 【任务2223】 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
wynne1005 b0b07437d6 还原pom 5 years ago
wynne1005 60c1f6ecab 还原pom 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
王杰 9675274a0d ptl 5 years ago
王杰 b946ca7fa1 [任务：2066，状态机异常处理] 5 years ago
王杰 6232d14e61 [任务：2066，状态机异常处理] 5 years ago
王杰 5ccc6c4408 andon 5 years ago
王杰 b0b276ba66 [任务：1938] 5 years ago
wynne1005 8ef3997038 还原pom 5 years ago
钮海涛 47131ff13f 修复版本问题 5 years ago
钮海涛 c344f017a9 修复sonar上的问题 5 years ago
wynne1005 8955fd2f4d mes提测 还原pom 5 years ago
wynne1005 23754d3f18 mes提测 还原pom 5 years ago
王杰 074093a46d [任务：1850 ，安灯流程设计] 5 years ago
王杰 648d8662b5 [任务：1851 安灯升级配置变更] 5 years ago
钮海涛 999a415d27 修复版本问题 5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 5 years ago
wynne1005 608aa6be90 还原pom 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 6dd2f12a2a Merge branch 'dev' into test 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
王杰 56ae714283 【任务：1845，安灯】 5 years ago
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 5 years ago
王杰 786c442d55 解决冲突 5 years ago
钮海涛 c1241bd6c5 修复版本问题 5 years ago
钮海涛 53a421b3b9 修复版本问题 5 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
王杰 029763feb1 pom 5 years ago
王杰 fc99ee8914 pojo 序列化 5 years ago
王杰 30fcf4f23f pom冲突 5 years ago
汪云昊 717f268c28 POJO版本号还原 5 years ago
王杰 a6e9b90026 pom 5 years ago
王杰 de9017ca5c 冲突 5 years ago
王杰 eaecf4b4b7 pom 5 years ago
王杰 7d192b36a6 pom冲突 5 years ago
钮海涛 005d0f7f86 修复合并问题 5 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
 5 years ago
钮海涛 a1eb3c3bc2 修复pom版本问题 5 years ago
钮海涛 288fb4a16b 修改POM版本号 5 years ago
汪云昊 2772ea6a2f Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-aps/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-ptl/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml
 5 years ago
汪云昊 8a8c3ee34d pom版本调整 5 years ago
贾文涛 492dfbff82 pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式 5 years ago
钮海涛 3b987436d8 新增LES管理功能 5 years ago
汪云昊 ec1d52e7dd MAVEN 版本控制调整 5 years ago
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331 5 years ago
wynne1005 44696061ee 修改pom文件为最新 5 years ago
wynne1005 286d605f09 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 d80b341620 还原test pom 5 years ago
曾贞一 5e2c592bbd 【IOT测试修改】 5 years ago
曾贞一 1cf4943751 冲突解决 5 years ago
曾贞一 77d7ac18ad Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-aps/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-ptl/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml
 5 years ago
wynne1005 2a619f69f8 将新pom提交到test 5 years ago
贾文涛 048419d823 修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 5 years ago
wynne1005 06551fdd66 还原pom 5 years ago
曾贞一 779b9d209c 【修改 DEV-pom.xml】 5 years ago
luweihao 12579c7a14 还原pom 5 years ago
王杰 42a22d14d3 安灯导出字=字段冗余 5 years ago
王杰 7bc434ed15 安灯组装模型优化 5 years ago
王杰 bc61b43e8d 安灯人员统计报表工位代码不显示问题修复 5 years ago
王杰 3ff9fbc140 安灯图表 5 years ago
王杰 cfa54aa2b6 修改pom 6 years ago
王杰 6da48220a5 Merge branch 'dev' into test 6 years ago
crish cba2cda2d4 安灯主界面部分字段赋初始值 6 years ago
crish 06e969af1b 安灯主界面 6 years ago
crish 74224b20ac 安灯主界面开发 6 years ago
crish 4d3adf5daf Merge branch 'dev' into test 6 years ago
crish b2b16e2017 安灯工位分组配置 6 years ago
crish 54ae351d91 安灯任务管理界面查询代码优化， 解决安灯任务， 开发信号发送逻辑 6 years ago
王杰 ac5432bebb 解决冲突 6 years ago
crish 5b6b303722 Merge branch 'test' 6 years ago
crish 17d5f1e512 Merge branch 'dev' into test 6 years ago
crish 97958262b6 查询条件优化 6 years ago
crish 410558d43c Merge branch 'test' 6 years ago
王杰 9137555226 Merge branch 'dev' into test 6 years ago
crish ad6baaa1e6 安灯通知方式调试， 日志调试 6 years ago
jenkins a7b751d9dc Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
crish 4bd4ca8745 通知方式， 通知内容 6 years ago
crish a30f4aae83 andon广播音量可配置， 安灯通知记录 6 years ago
许心洁 003ed70f98 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish aa22d18645 添加注解 6 years ago
crish 577b2c462a 按照安灯类型统计当天发生的安灯总次数和安灯超时次数 6 years ago
许心洁 ed7e002f6d Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish a294c1ccb0 安灯看板超时统计功能 6 years ago
crish c4d7a2380c Merge branch 'test' 6 years ago
许心洁 017cd18950 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish 1a7fda268b andon 系统配置 6 years ago
许心洁 c79786a677 合并开发分支的代码POM文件被改成DEV修改回TEST 6 years ago
crish 18161e8191 Merge branch 'test' 6 years ago
crish 67461457fc Merge branch 'dev' into test 6 years ago
crish 1e0f0c706c 安灯问题修复 6 years ago
crish 4eaa8b5b17 导入导出 6 years ago
crish 6902c79472 问题清单问题修复 6 years ago
crish 7d8b8664cc 问题清单问题修复 6 years ago
许心洁 0c20a2b655 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish 0824a58ead 安灯定时自处理job, 广播播报内容优化 6 years ago
crish 15e812c7a6 Merge branch 'test' 6 years ago
crish 7d20321be5 Merge branch 'dev' into test 6 years ago
crish 901e37d6e7 修复bug 6 years ago
crish 0526da8ee3 Merge branch 'test' 6 years ago
crish cd74f5336f Merge branch 'dev' into test 6 years ago
crish bdb818930b 安灯广播，自处理 6 years ago
刘辉 e89df89f9a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 9e4930968f 解决冲突 6 years ago
刘辉 febbea09c3 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
crish 0fdabe4950 知识库 ，自处理开发 6 years ago