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 |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
|
crish
|
9edfa3d481
|
安灯知识库
|
6 years ago |
|
crish
|
97763d6b53
|
安灯广播， 安灯管理显示不同界面， 添加操作来源字段
|
6 years ago |
|
crish
|
ce187f9720
|
安灯广播
|
6 years ago |
|
crish
|
dc3fd624f2
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
c39462cd35
|
安灯广播
|
6 years ago |
|
crish
|
40321ed7ec
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4e2373bdae
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
db26628d9f
|
安灯广播
|
6 years ago |
|
crish
|
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 |
|
crish
|
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 |
WYnneaoapc
|
8f77ec0864
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
77a8cdebd5
|
安灯升级
|
6 years ago |
|
许心洁
|
e35cf183da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
ff272afe2c
|
添加工厂条件
|
6 years ago |
|
许心洁
|
7a403a37da
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
bleakney.liu
|
4409f34e0f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
aea18f89c6
|
安灯放行说明字段维护openInfo， 安灯响应通知标识字段signSendFlag维护
|
6 years ago |
|
crish
|
e20ee7b1ff
|
安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤
|
6 years ago |
|
crish
|
fb9340fc09
|
安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑
|
6 years ago |
 王杰
|
80f50fe800
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
9ae6ee5016
|
Merge branch 'test'
|
6 years ago |
|
crish
|
51c21f2c22
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
4173f0637f
|
安灯正式环境发布
|
6 years ago |
|
crish
|
f3f77e63b3
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4d5497929a
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
9f0f6da4c7
|
安灯原因统计报表增加发生频次统计
|
6 years ago |
 曾贞一
|
6c8cfd8678
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
|
crish
|
81128be4e7
|
安灯事件原因报表增加日发生频次， 周发生频次
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
ad9f532cd7
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
989cbbdee8
|
安灯目录结构调整
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
bbfc9b320f
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
f205373964
|
安灯事件报表安灯类型导出
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
39e0fbca80
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
3266c9b1e0
|
安灯状态导出
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
5e06022e51
|
Merge remote-tracking branch 'remotes/origin/dev'
|
6 years ago |
jimmy.zeng
|
2a7ba550d6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
235a728c0e
|
andon
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
154730e69b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
f09ac4d897
|
安灯任务
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
曾贞一
|
18aff86ea0
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
crish
|
bfd682cb27
|
安灯按照产线过滤信息
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
曾贞一
|
b10b967b73
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
4359f347c6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
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 |
peter.pan
|
47238f131b
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
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 |
|
peter.pan
|
ad09180809
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c1ca7cbcae
|
Andon组织模型操作接口
Andon班次计算调整
|
6 years ago |
|
汪云昊
|
0ed90485a6
|
安灯基础数据导入导出
|
6 years ago |
|
peter.pan
|
24f7ae3471
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
53d34096f7
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
8a5a7c23ca
|
andonPLC MQ 推送配置
|
6 years ago |
|
peter.pan
|
eeefb843b4
|
Merge branch 'test'
|
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 |
|
peter.pan
|
176f9ffd5f
|
Merge branch 'test'
|
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
|
33ec897657
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
|
wei.peng
|
aa23889514
|
Merge branches 'dev' and 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
jenkins
|
f75a861d05
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
0c1d1b3d97
|
添加FastDfs 配置
|
6 years ago |
|
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
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
|
7 years ago |
柯裕
|
3d3e7eaf0d
|
ANDON基础数据
|
7 years ago |
|
allen.zhang
|
67e3851a86
|
Merge branch 'dev' into test
|
7 years ago |
|
柯裕
|
d081c16c61
|
安灯类型，状态，子类型，基础数据开发
|
7 years ago |
Silliter
|
98f35a5624
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
24f3b065cf
|
安灯事件现象和重要度
|
7 years ago |
|
柯裕
|
f1e8f07a90
|
新增需求：自处理
|
7 years ago |
|
allen.zhang
|
d70f85d592
|
Merge branch 'dev' into test
|
7 years ago |
|
Silliter
|
5e02ce9c67
|
呼叫升级和响应升级优化
|
7 years ago |
|
Silliter
|
27b32626b3
|
开发主动升级和启动产线业务
|
7 years ago |
|
Silliter
|
b89e5c5fb9
|
呼叫升级和响应升级优化
|
7 years ago |
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
Silliter
|
e2247b2657
|
呼叫升级和响应升级优化
|
7 years ago |
|
Silliter
|
8a298687c2
|
开发andon呼叫停止产线
|
7 years ago |
|
Silliter
|
ee1806025c
|
开发andon呼叫停止产线
|
7 years ago |
|
wei.peng
|
019505c4d2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
柯裕
|
c9f16c701f
|
ANDON更新
|
7 years ago |
|
柯裕
|
022795e344
|
ANDON统计报表更新
|
7 years ago |
|
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
7 years ago |
|
柯裕
|
8aa958b902
|
ANDON统计报表更新
|
7 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
7 years ago |
|
柯裕
|
d62904cac7
|
ANDON统计报表更新（待改进）
|
7 years ago |
|
柯裕
|
00086912bc
|
ANDON实体更新
|
7 years ago |
|
allen.zhang
|
8afe54af50
|
Merge branch 'dev' into test
|
7 years ago |
|
柯裕
|
b581cbee63
|
ANDON实体更新
|
7 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
yiming.gu
|
5fc11292ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
280f9a2233
|
MES新增班次休息表、物料关键数据关系表
|
7 years ago |
|
柯裕
|
d9b263d10c
|
ANDON_HQLPACK更新
|
7 years ago |
|
Silliter
|
ac42a9eb37
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
柯裕
|
2e4f792afa
|
ANDON更新
|
7 years ago |
|
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
7 years ago |
|
Silliter
|
df02c5d1b2
|
开发安灯呼叫升级定时任务
|
7 years ago |
|
柯裕
|
021e308a9e
|
ANDON实体更新
|
7 years ago |
|
Silliter
|
e31b35b6e3
|
安灯实体索引加入
|
7 years ago |
|
jenkins
|
21d3c053ca
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
柯裕
|
26693e107f
|
ANDON实体更新
|
7 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
251ce84d73
|
开发安灯呼叫升级定时任务
|
7 years ago |
|
Silliter
|
c1949e099c
|
开发安灯呼叫升级定时任务
|
7 years ago |
|
柯裕
|
d3be2fb6df
|
ANDON更新
|
7 years ago |
|
Silliter
|
ad28d11486
|
安灯项目优化
|
7 years ago |
|
Silliter
|
b70069e7ce
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
791d6084bc
|
安灯看板开发
|
7 years ago |
|
yiming.gu
|
2eb732c7df
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
|
7 years ago |
|
yiming.gu
|
7c647c7844
|
1、班次pojo修改
2、andon项目新增组织模型基础数据
|
7 years ago |
|
Silliter
|
7d762dac6a
|
按灯系统配置开发
|
7 years ago |
|
allen.zhang
|
2985d2888d
|
Merge branch 'dev' into test
|
7 years ago |
|
Silliter
|
e2ce7c5ce9
|
物理按灯开发
|
7 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
7 years ago |
|
柯裕
|
44e2a13ff5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
b56994fcca
|
ANDON更新
|
7 years ago |
|
Silliter
|
6b295aaace
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
8c5970d500
|
物理按灯开发
|
7 years ago |
|
柯裕
|
dfba307e43
|
ANDON_HQLPACK更新
|
7 years ago |
|
柯裕
|
95789ab615
|
ANDON实体枚举更新
|
7 years ago |
|
柯裕
|
ba368a0327
|
ANDON更新
|
7 years ago |
|
柯裕
|
1977dc230b
|
ANDON实体创建
|
7 years ago |
|
柯裕
|
1b702d0821
|
ANDON_HQLPACK更新
|
7 years ago |
|
Silliter
|
c9c470a27f
|
开发物理安灯业务
|
7 years ago |
|
Silliter
|
da56d45a68
|
安灯项目优化
|
7 years ago |
|
Silliter
|
47bd2c0aa7
|
安灯项目开发
|
7 years ago |
|
柯裕
|
4895b3ae85
|
ANDON实体更新
|
7 years ago |
|
柯裕
|
02281095ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
0e090c7e08
|
优化POJO
|
7 years ago |
|
yiming.gu
|
9281b74453
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
f844f89f5d
|
andon新增班次表
|
7 years ago |
|
柯裕
|
060fa564da
|
更新AndonHqlPack
|
7 years ago |
|
Silliter
|
81b03ff299
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
68a66c67b0
|
设备pojo新增工作中心代码，区域代码
|
7 years ago |
|
Silliter
|
4c11c1645d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
e02f61c51f
|
安灯项目优化
|
7 years ago |
alwaysfrin
|
5fa2b67880
|
安灯源码位置错误，重新调整
|
7 years ago |
|
柯裕
|
a11d2c04d5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
f6c90bd96b
|
ANDON创建dao
|
7 years ago |
|
Silliter
|
7f8c0303fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
f89090c40e
|
按灯项目实体创建
|
7 years ago |
|
柯裕
|
97aa0ea44c
|
ANDON实体创建
|
7 years ago |
|
jenkins
|
298a3c1ddf
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
e38a7de8ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
5ef8089c02
|
ANDON实体创建
|
7 years ago |
|
柯裕
|
30db0904a4
|
ANDON实体创建
|
7 years ago |
|
Silliter
|
c5093b073c
|
安灯实体优化
|
7 years ago |
|
Silliter
|
24af646ad8
|
安灯项目开发环境搭建
|
7 years ago |
|
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
7 years ago |
|
wei.peng
|
521f474753
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test
# Conflicts:
# modules/i3plus-block-form/src/main/resources/application-test.properties
# modules/i3plus-block-report/src/main/resources/application-test.properties
合并代码 发版修改配置 - Pw
2019-5-8 20:53:28
|
7 years ago |
|
alwaysfrin
|
f343ea865c
|
安灯和硬件适配初始化
|
7 years ago |