 王杰
|
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 |
|
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 |