luweihao
|
e90ea98d1f
|
解决冲突
|
6 years ago |
|
luweihao
|
03f1c4fddf
|
修改生产数据结构
|
6 years ago |
joke lin
|
3b928c6ddc
|
[bug: 7637 生产数据]
|
6 years ago |
|
joke lin
|
e8f48bcb04
|
[bug: 7637 生产数据查询]
|
6 years ago |
zcg
|
3d28840bae
|
【新增枚举，pojo】
|
6 years ago |
|
陆卫豪
|
a65350bbf8
|
Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
b52bb02d73
|
task `1430` 工位扫描，产品信号监听，队列监听
|
6 years ago |
|
zcg
|
416c2ceffc
|
【任务 1443 excel模板导入功能修改】
|
6 years ago |
|
zcg
|
9388e3b4f2
|
【pojo 冲突提交】
|
6 years ago |
|
luweihao
|
679319635a
|
task `1430` 工位扫描，产品信号监听，队列监听
|
6 years ago |
陈思洁
|
4fec84f810
|
【PTL_PLC配置表增加字段】
|
6 years ago |
|
陆卫豪
|
60ab731ffd
|
Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev
|
6 years ago |
|
joke lin
|
d4e1e854c5
|
[任务：1441 plc推送数据]
|
6 years ago |
qianhs
|
65572b34a0
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
6 years ago |
|
zcg
|
bd82a0fba7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
 曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
6 years ago |
|
joke lin
|
4823660070
|
[任务：1435 计划管理]
|
6 years ago |
 王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
6 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
6 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
6 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
6 years ago |
|
曾贞一
|
4fcd7cbc3f
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
|
joke lin
|
cb09776bdb
|
[任务：1435 计划管理]
|
6 years ago |
|
陈思洁
|
102af98a75
|
【PTL_增加主任务编号字段和组内编号字段】
|
6 years ago |
|
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
6 years ago |
|
joke lin
|
ccf2817788
|
[计划管理]
|
6 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
 钮海涛
|
ca6e094271
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
00252caa0c
|
移动mespcn公用model
|
6 years ago |
|
luweihao
|
005db6ac5b
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
7beaa515c8
|
task `1428` 作业流程
|
6 years ago |
joke
|
531596d2d4
|
[mes: 49 JIT计划与管理]
|
6 years ago |
|
luweihao
|
7c77c90a3c
|
task 作业流程
|
6 years ago |
|
luweihao
|
dd6007656c
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
4918707fc8
|
bug `7626` 开线管控-数据存入数据库错误
|
6 years ago |
|
luweihao
|
f67dd06cd4
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
5892f87bdc
|
task `1425` pcn pojo 迁移
|
6 years ago |
|
luweihao
|
51152656cc
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
e2d63434db
|
bug `7570` `7561` 生产扣减代码去除测试代码
|
6 years ago |
jenkins
|
1ada447069
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
68cbd54f37
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
5fd51f6b1d
|
task 任务重试测试
|
6 years ago |
|
joke
|
d42b7ebbb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke
|
2b84f93950
|
任务: 1424 DT通信
|
6 years ago |
|
luweihao
|
be2f1cb146
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
5eb7cf03ed
|
task 数据同步添加错误信息字段
|
6 years ago |
|
luweihao
|
03a139e435
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
e38839db6c
|
task `1408` 数据同步修改
|
6 years ago |
|
jenkins
|
499a5ed894
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
1a2f00afc3
|
task `1408` 添加数据同步存储
|
6 years ago |