nies
|
0cda9012f2
|
Merge branch 'test' into dev
|
4 years ago |
Dominic_Xiao
|
e415b4599d
|
安灯报表新增基础字段
|
4 years ago |
|
Dominic_Xiao
|
cee28a81bc
|
安灯新增班休表
|
4 years ago |
|
Dominic_Xiao
|
37b352ce0b
|
安灯新增班休表
|
4 years ago |
|
Dominic_Xiao
|
21c9a4ae01
|
新增安灯目标表
|
4 years ago |
|
Dominic_Xiao
|
f2274243a6
|
安灯新增目标表
|
4 years ago |
|
Dominic_Xiao
|
5755f86ca5
|
安灯新增目标表
|
4 years ago |
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
 王杰
|
a71774ba24
|
pom
|
4 years ago |
|
王杰
|
21ca70f863
|
pom
|
4 years ago |
jun
|
bda7b30475
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
puxiao.liao
|
17151a9b79
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
joke.wang
|
e0e1231e09
|
16381 19081-andon事件处理-增加字段
|
4 years ago |
|
puxiao.liao
|
a4bc97c5da
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
8b5447f5ca
|
停机统计报表
|
4 years ago |
|
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
|
王杰
|
a321a28759
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
王杰
|
4fe445e4c3
|
test merge dev
|
4 years ago |
陈思洁
|
ce8a66d83a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
4d5cdc710e
|
【16023 19081-部分工位安灯呼叫没有反应、呼叫成功无法取消和处理-20210525】
|
4 years ago |
|
puxiao.liao
|
c42a4b250d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
5eae801feb
|
16073 19081-看板管理-产量看板-产量看板调整
|
4 years ago |
|
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
|
puxiao.liao
|
2adc935bb0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-mes-pcn/pom.xml
sonar-project.properties
|
4 years ago |
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
4 years ago |
|
wynne1005
|
a44a4a8be3
|
Merge branch 'dev' into test
|
4 years ago |
|
Dominic_Xiao
|
9fc68bc443
|
14382 19081-安灯广播速度调整未生效-20210312:修改播放速度类型为浮点型
|
4 years ago |
|
王杰
|
f8e0146b19
|
pom
|
4 years ago |
andly.pan
|
4261e9d34e
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
陈思洁
|
6b4ae7eb71
|
【3254 泰国-上装总成套膜标签打印】
|
4 years ago |
|
王杰
|
2b89e35c69
|
pom
|
4 years ago |
许心洁
|
410b95aefd
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
# modules/i3plus-wms-apiservice/pom.xml
|
4 years ago |
|
王杰
|
5a5874b137
|
test
|
4 years ago |
|
许心洁
|
896a88de44
|
合并测服代码
|
4 years ago |
|
许心洁
|
d107c7a3fe
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
joke.wang
|
0a389480f3
|
13696 新增不良维修记录报表
|
4 years ago |
 钮海涛
|
2740830e8f
|
合并test代码
|
4 years ago |
 曾贞一
|
bbd5dccbf8
|
【合并分支】
|
4 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
|
钮海涛
|
baed7db4ed
|
合并dev代码
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
wynne1005
|
b7c4e76163
|
增加joined注解
|
4 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
joke.wang
|
058bd05b4a
|
mgn-bj esop展示组件优化
|
5 years ago |
|
joke.wang
|
ae1bb43764
|
mgn-bj edi删除多余项
|
5 years ago |
|
陈思洁
|
0be2231995
|
【12238 19073-安灯报表-通知记录-工作中心查询条件失效】
|
5 years ago |
|
陈思洁
|
6fcf32aa80
|
【2890 10 2.3.8安灯作业优化】
|
5 years ago |
|
钮海涛
|
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 |