王杰
5ccc6c4408
andon
5 years ago
王杰
b0b276ba66
[任务：1938]
5 years ago
8ef3997038
还原pom
5 years ago
钮海涛
47131ff13f
修复版本问题
5 years ago
钮海涛
c344f017a9
修复sonar上的问题
5 years ago
8955fd2f4d
mes提测 还原pom
5 years ago
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
608aa6be90
还原pom
5 years ago
99d3c9d721
提测合并 还原pom
5 years ago
6dd2f12a2a
Merge branch 'dev' into test
5 years ago
5ef88c80c0
提测合并 还原pom
5 years ago
王杰
56ae714283
【任务：1845，安灯】
5 years ago
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
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
44696061ee
修改pom文件为最新
5 years ago
286d605f09
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
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
2a619f69f8
将新pom提交到test
5 years ago
贾文涛
048419d823
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
5 years ago
06551fdd66
还原pom
5 years ago
曾贞一
779b9d209c
【修改 DEV-pom.xml】
5 years ago
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
cba2cda2d4
安灯主界面部分字段赋初始值
6 years ago
06e969af1b
安灯主界面
6 years ago
74224b20ac
安灯主界面开发
6 years ago
4d3adf5daf
Merge branch 'dev' into test
6 years ago
b2b16e2017
安灯工位分组配置
6 years ago
54ae351d91
安灯任务管理界面查询代码优化， 解决安灯任务， 开发信号发送逻辑
6 years ago
王杰
ac5432bebb
解决冲突
6 years ago
5b6b303722
Merge branch 'test'
6 years ago
17d5f1e512
Merge branch 'dev' into test
6 years ago
97958262b6
查询条件优化
6 years ago
410558d43c
Merge branch 'test'
6 years ago
王杰
9137555226
Merge branch 'dev' into test
6 years ago
ad6baaa1e6
安灯通知方式调试， 日志调试
6 years ago
a7b751d9dc
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
4bd4ca8745
通知方式， 通知内容
6 years ago
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
aa22d18645
添加注解
6 years ago
577b2c462a
按照安灯类型统计当天发生的安灯总次数和安灯超时次数
6 years ago
ed7e002f6d
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
a294c1ccb0
安灯看板超时统计功能
6 years ago
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
1a7fda268b
andon 系统配置
6 years ago
c79786a677
合并开发分支的代码POM文件被改成DEV修改回TEST
6 years ago
18161e8191
Merge branch 'test'
6 years ago
67461457fc
Merge branch 'dev' into test
6 years ago
1e0f0c706c
安灯问题修复
6 years ago
4eaa8b5b17
导入导出
6 years ago
6902c79472
问题清单问题修复
6 years ago
7d8b8664cc
问题清单问题修复
6 years ago
0c20a2b655
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
0824a58ead
安灯定时自处理job, 广播播报内容优化
6 years ago
15e812c7a6
Merge branch 'test'
6 years ago
7d20321be5
Merge branch 'dev' into test
6 years ago
901e37d6e7
修复bug
6 years ago
0526da8ee3
Merge branch 'test'
6 years ago
cd74f5336f
Merge branch 'dev' into test
6 years ago
bdb818930b
安灯广播，自处理
6 years ago
e89df89f9a
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
9e4930968f
解决冲突
6 years ago
febbea09c3
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
0fdabe4950
知识库 ，自处理开发
6 years ago
1de89d732b
本地误拉了test代码，解决pom
6 years ago
9f9874902d
冲突解决
6 years ago
9edfa3d481
安灯知识库
6 years ago
97763d6b53
安灯广播， 安灯管理显示不同界面， 添加操作来源字段
6 years ago
ce187f9720
安灯广播
6 years ago
dc3fd624f2
Merge branch 'dev' into test
6 years ago
c39462cd35
安灯广播
6 years ago
40321ed7ec
Merge branch 'test'
6 years ago
4e2373bdae
Merge branch 'dev' into test
6 years ago
db26628d9f
安灯广播
6 years ago
0924810e64
Merge branch 'test'
6 years ago
56f7048098
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
16073eb7e5
安灯附属表插入时， 完整数据； 添加安灯来源接口
6 years ago
1e41ab2e39
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
1defd0d8be
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
8f77ec0864
Merge branch 'dev' into test
6 years ago
77a8cdebd5
安灯升级
6 years ago
e35cf183da
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
ff272afe2c
添加工厂条件
6 years ago
7a403a37da
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
4409f34e0f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
aea18f89c6
安灯放行说明字段维护openInfo， 安灯响应通知标识字段signSendFlag维护
6 years ago
e20ee7b1ff
安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤
6 years ago
fb9340fc09
安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑
6 years ago
王杰
80f50fe800
Merge branch 'dev' into test
6 years ago
9ae6ee5016
Merge branch 'test'
6 years ago
51c21f2c22
Merge branch 'dev' into test
6 years ago
4173f0637f
安灯正式环境发布
6 years ago
f3f77e63b3
Merge branch 'test'
6 years ago
4d5497929a
Merge branch 'dev' into test
6 years ago
9f0f6da4c7
安灯原因统计报表增加发生频次统计
6 years ago
曾贞一
6c8cfd8678
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
81128be4e7
安灯事件原因报表增加日发生频次， 周发生频次
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
ad9f532cd7
Merge branch 'dev' into test
6 years ago
989cbbdee8
安灯目录结构调整
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
bbfc9b320f
Merge branch 'test'
6 years ago
4a1ad40dfa
Merge branch 'dev' into test
6 years ago
f205373964
安灯事件报表安灯类型导出
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
39e0fbca80
Merge branch 'dev' into test
6 years ago
3266c9b1e0
安灯状态导出
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
5e06022e51
Merge remote-tracking branch 'remotes/origin/dev'
6 years ago
2a7ba550d6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
235a728c0e
andon
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
154730e69b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f09ac4d897
安灯任务
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
18aff86ea0
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
c901f18f89
pom版本还原
6 years ago
bfd682cb27
安灯按照产线过滤信息
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
b10b967b73
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
4359f347c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
dd418f8b51
开线信号发送逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
47d4a53706
Merge branch 'dev'
...
# Conflicts:
# modules/i3plus-pojo-andon/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-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
6 years ago
曾贞一
8b457c0618
DEV 合并 TEST pom.xml文件修改
6 years ago
e7913cfb26
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
6 years ago
曾贞一
fb07628555
Merge branch 'dev' into test
6 years ago
341994c326
安灯报表优化
6 years ago
47238f131b
Merge branch 'test'
6 years ago
8daa2789a4
Merge branch 'dev' into test
6 years ago
7181e85ba5
安灯导出实体注解
...
定时任务日志添加字段
6 years ago
6598a829e0
Merge branch 'dev'
6 years ago
af2e1a811c
andon组织模型导入功能
...
andon删除关联数据校验
6 years ago
ad09180809
Merge branch 'dev' into test
6 years ago
c1ca7cbcae
Andon组织模型操作接口
...
Andon班次计算调整
6 years ago
0ed90485a6
安灯基础数据导入导出
6 years ago
24f7ae3471
Merge branch 'test'
6 years ago
53d34096f7
Merge branch 'dev' into test
6 years ago
8a5a7c23ca
andonPLC MQ 推送配置
6 years ago
eeefb843b4
Merge branch 'test'
6 years ago
37b8755485
Merge branch 'dev' into test
6 years ago
d3deaa6081
安灯bug解决
...
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
6 years ago
176f9ffd5f
Merge branch 'test'
6 years ago
eb2f61c32f
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
4309454d2a
邮件异常提示优化
...
EXCEL数据通用导出
6 years ago
33ec897657
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
734340fe63
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
6259bd56bc
通用EXCEl导出MODEL
6 years ago
aa23889514
Merge branches 'dev' and 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
f75a861d05
Merge remote-tracking branch 'origin/dev' into test
6 years ago
0c1d1b3d97
添加FastDfs 配置
6 years ago
bec3a7098d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
884d4fd763
Merge remote-tracking branch 'origin/dev' into test
6 years ago
2efbd7b6b8
安灯
...
停机类型 增删改查询
事件原因 增删改查
呼叫原因 增删改查
6 years ago
215db96fa9
安灯 停机类型 功能接口完成
6 years ago
ad15137704
安灯 事件原因 功能接口完成
6 years ago
ac8b9d3986
Merge remote-tracking branch 'origin/dev' into test
6 years ago
c74ebe40f3
删除冗余代码
6 years ago
1eccc09ab6
安灯类型 查 表 已从表改为枚举
...
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
6 years ago
b7a7eb29ae
安灯类型 查 表 已从表改为枚举
...
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
6 years ago
71060f26f3
事件信息维护
6 years ago
69c74d0db1
Merge branch 'dev' into test
6 years ago
3d3e7eaf0d
ANDON基础数据
6 years ago
67e3851a86
Merge branch 'dev' into test
6 years ago
d081c16c61
安灯类型，状态，子类型，基础数据开发
6 years ago
98f35a5624
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
24f3b065cf
安灯事件现象和重要度
6 years ago
f1e8f07a90
新增需求：自处理
6 years ago
王杰
wynne1005
钮海涛
wei.peng
汪云昊
贾文涛
曾贞一
luweihao
crish
jenkins
许心洁
刘辉
jokelone
jimmy.zeng
于学杰
peter.pan
jenkins
allen.zhang
柯裕
Silliter