 曾贞一
|
bcb8dee045
|
【1558 生产工单管理-泰国需求】
|
5 years ago |
wynne1005
|
3c08e7794f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
 贾文涛
|
eed24e0297
|
统一修改pom文件的项目版本问题
|
5 years ago |
qianhs
|
3b763b45cd
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
joke.wang
|
4cb3d89ad6
|
[bug: 7637 生产数据ees查询修改]
|
5 years ago |
 钮海涛
|
c37809d5b7
|
合并源仓库的修改
|
5 years ago |
|
wynne1005
|
f345ed2b2f
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
5 years ago |
 王杰
|
0502f6d736
|
【任务：1529，料架分组队列展示组件】
|
5 years ago |
|
joke.wang
|
7a6e9b9e21
|
[任务：1479 料架打印]
|
5 years ago |
陈思洁
|
c4032b8ed5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
320969f2f0
|
【1527 半成品标签自动打印】
|
5 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
5 years ago |
|
wynne1005
|
4b4bf4e433
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
9d5567f4a6
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
e3a9defdab
|
任务1528，生成并打印门锁标签
|
5 years ago |
|
wynne1005
|
6336ebd8e9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
8b750e6a76
|
修改生产数据类型
|
5 years ago |
|
王杰
|
a9a7d78bd5
|
解决冲突
|
5 years ago |
|
joke.wang
|
9d55a2a8b3
|
[解决冲突1]
|
5 years ago |
|
joke.wang
|
8b681af622
|
[解决冲突]
|
5 years ago |
|
joke.wang
|
045dc01479
|
[任务：1479 料架条码打印]
|
5 years ago |
|
王杰
|
f578311f55
|
数据复核
|
5 years ago |
|
qianhs
|
564ba1e116
|
【1472 工步-设备状态采集（原PLC采集【设备状态】）】
|
5 years ago |
|
qianhs
|
c53999b0d2
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
joke.wang
|
79788daf8b
|
pom 修改
|
5 years ago |
zcg
|
74e4aa953b
|
【任务 1480 照片采集】
|
5 years ago |
joke lin
|
62cee148cd
|
[bug: 7875 客户JIT生产工单]
|
5 years ago |
|
钮海涛
|
9da6628884
|
Merge branch 'master' into test
|
5 years ago |
|
陈思洁
|
cc207240b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
bacab3fb88
|
【MES_新增设备工装关系和工装操作记录pojo】
|
5 years ago |
|
王杰
|
9f8e51830e
|
mes enum
|
5 years ago |
|
qianhs
|
8d18c61d63
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
joke lin
|
126440c976
|
[任务：1435 客户JIT导入]
|
5 years ago |
|
陈思洁
|
310bf49af6
|
【MES_校验是否换膜并推送换模信号 】
|
5 years ago |
|
陈思洁
|
22788f1c44
|
还原POM文件TEST-DEV
|
5 years ago |
|
qianhs
|
a93882c881
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
5 years ago |
|
qianhs
|
26bf62fbe7
|
设备状态采集工步
|
5 years ago |
|
陈思洁
|
474bb995d6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
7d743c2c7f
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
b3e38170e6
|
【1440 PLC采集工步【生产数据】】
|
5 years ago |
luweihao
|
e90ea98d1f
|
解决冲突
|
5 years ago |
|
luweihao
|
03f1c4fddf
|
修改生产数据结构
|
5 years ago |
|
王杰
|
af4cb74392
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
joke lin
|
3b928c6ddc
|
[bug: 7637 生产数据]
|
5 years ago |
|
joke lin
|
e8f48bcb04
|
[bug: 7637 生产数据查询]
|
5 years ago |
|
王杰
|
b6a83fff5d
|
Merge branch 'dev' into test
|
5 years ago |
|
zcg
|
3d28840bae
|
【新增枚举，pojo】
|
5 years ago |
|
luweihao
|
16879a4f20
|
Merge branch 'dev' into test
|
5 years ago |
|
陆卫豪
|
a65350bbf8
|
Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
|
luweihao
|
b52bb02d73
|
task `1430` 工位扫描，产品信号监听，队列监听
|
5 years ago |
|
zcg
|
416c2ceffc
|
【任务 1443 excel模板导入功能修改】
|
5 years ago |
|
zcg
|
9388e3b4f2
|
【pojo 冲突提交】
|
5 years ago |
|
luweihao
|
679319635a
|
task `1430` 工位扫描，产品信号监听，队列监听
|
5 years ago |
|
陈思洁
|
4fec84f810
|
【PTL_PLC配置表增加字段】
|
5 years ago |
|
陆卫豪
|
60ab731ffd
|
Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev
|
5 years ago |
|
joke lin
|
d4e1e854c5
|
[任务：1441 plc推送数据]
|
5 years ago |
|
qianhs
|
65572b34a0
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
zcg
|
bd82a0fba7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
5 years ago |
|
joke lin
|
4823660070
|
[任务：1435 计划管理]
|
5 years ago |
|
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
5 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
|
贾文涛
|
30722b130c
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
5 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
5 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
5 years ago |
|
曾贞一
|
4fcd7cbc3f
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
joke lin
|
cb09776bdb
|
[任务：1435 计划管理]
|
5 years ago |
|
陈思洁
|
102af98a75
|
【PTL_增加主任务编号字段和组内编号字段】
|
5 years ago |
|
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
5 years ago |
|
joke lin
|
ccf2817788
|
[计划管理]
|
5 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
钮海涛
|
ca6e094271
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
00252caa0c
|
移动mespcn公用model
|
5 years ago |
|
luweihao
|
005db6ac5b
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
7beaa515c8
|
task `1428` 作业流程
|
5 years ago |
joke
|
531596d2d4
|
[mes: 49 JIT计划与管理]
|
5 years ago |
|
luweihao
|
9f95e97ec3
|
Merge branch 'test'
|
5 years ago |
|
luweihao
|
7c77c90a3c
|
task 作业流程
|
5 years ago |
|
luweihao
|
dd6007656c
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
4918707fc8
|
bug `7626` 开线管控-数据存入数据库错误
|
5 years ago |
|
luweihao
|
f67dd06cd4
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
5892f87bdc
|
task `1425` pcn pojo 迁移
|
5 years ago |
|
luweihao
|
b0d214f204
|
Merge branch 'test'
|
5 years ago |
|
luweihao
|
51152656cc
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
e2d63434db
|
bug `7570` `7561` 生产扣减代码去除测试代码
|
5 years ago |
|
王杰
|
7662905caa
|
Merge branch 'test'
|
5 years ago |
jenkins
|
1ada447069
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
68cbd54f37
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
5fd51f6b1d
|
task 任务重试测试
|
5 years ago |
|
joke
|
d42b7ebbb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke
|
2b84f93950
|
任务: 1424 DT通信
|
5 years ago |
|
luweihao
|
be2f1cb146
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
5eb7cf03ed
|
task 数据同步添加错误信息字段
|
5 years ago |
|
luweihao
|
03a139e435
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
e38839db6c
|
task `1408` 数据同步修改
|
5 years ago |
|
jenkins
|
499a5ed894
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
1a2f00afc3
|
task `1408` 添加数据同步存储
|
5 years ago |