crish
|
bfd682cb27
|
安灯按照产线过滤信息
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
dd418f8b51
|
开线信号发送逻辑修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
 曾贞一
|
fb07628555
|
Merge branch 'dev' into test
|
6 years ago |
汪云昊
|
341994c326
|
安灯报表优化
|
6 years ago |
peter.pan
|
8daa2789a4
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
7181e85ba5
|
安灯导出实体注解
定时任务日志添加字段
|
6 years ago |
|
汪云昊
|
af2e1a811c
|
andon组织模型导入功能
andon删除关联数据校验
|
6 years ago |
|
peter.pan
|
ad09180809
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c1ca7cbcae
|
Andon组织模型操作接口
Andon班次计算调整
|
6 years ago |
|
汪云昊
|
0ed90485a6
|
安灯基础数据导入导出
|
6 years ago |
|
peter.pan
|
53d34096f7
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
8a5a7c23ca
|
andonPLC MQ 推送配置
|
6 years ago |
|
peter.pan
|
37b8755485
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
d3deaa6081
|
安灯bug解决
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
|
6 years ago |
wei.peng
|
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 |
|
wei.peng
|
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 |
jenkins
|
f75a861d05
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
0c1d1b3d97
|
添加FastDfs 配置
|
6 years ago |
|
jenkins
|
884d4fd763
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
2efbd7b6b8
|
安灯
停机类型 增删改查询
事件原因 增删改查
呼叫原因 增删改查
|
6 years ago |
|
wei.peng
|
215db96fa9
|
安灯 停机类型 功能接口完成
|
6 years ago |
|
wei.peng
|
ad15137704
|
安灯 事件原因 功能接口完成
|
6 years ago |
|
jenkins
|
ac8b9d3986
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
c74ebe40f3
|
删除冗余代码
|
6 years ago |
|
wei.peng
|
1eccc09ab6
|
安灯类型 查 表 已从表改为枚举
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
|
6 years ago |
|
wei.peng
|
b7a7eb29ae
|
安灯类型 查 表 已从表改为枚举
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
|
6 years ago |
|
汪云昊
|
71060f26f3
|
事件信息维护
|
6 years ago |
allen.zhang
|
69c74d0db1
|
Merge branch 'dev' into test
|
6 years ago |
柯裕
|
3d3e7eaf0d
|
ANDON基础数据
|
6 years ago |
|
allen.zhang
|
67e3851a86
|
Merge branch 'dev' into test
|
6 years ago |
|
柯裕
|
d081c16c61
|
安灯类型，状态，子类型，基础数据开发
|
6 years ago |
Silliter
|
98f35a5624
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
24f3b065cf
|
安灯事件现象和重要度
|
6 years ago |
|
柯裕
|
f1e8f07a90
|
新增需求：自处理
|
6 years ago |
|
allen.zhang
|
d70f85d592
|
Merge branch 'dev' into test
|
6 years ago |
|
Silliter
|
5e02ce9c67
|
呼叫升级和响应升级优化
|
6 years ago |
|
Silliter
|
27b32626b3
|
开发主动升级和启动产线业务
|
6 years ago |
|
Silliter
|
b89e5c5fb9
|
呼叫升级和响应升级优化
|
6 years ago |
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
Silliter
|
e2247b2657
|
呼叫升级和响应升级优化
|
6 years ago |
|
Silliter
|
8a298687c2
|
开发andon呼叫停止产线
|
6 years ago |
|
Silliter
|
ee1806025c
|
开发andon呼叫停止产线
|
6 years ago |
|
wei.peng
|
019505c4d2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
柯裕
|
c9f16c701f
|
ANDON更新
|
6 years ago |
|
柯裕
|
022795e344
|
ANDON统计报表更新
|
6 years ago |
|
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
6 years ago |
|
柯裕
|
8aa958b902
|
ANDON统计报表更新
|
6 years ago |