 王杰
|
09cff08e1e
|
[需求1086，设备点检保养作业，第2次提交]
|
6 years ago |
wei.peng
|
5e78c31a70
|
LAC 名称修改
|
6 years ago |
WYnneaoapc
|
87ffdfd9a3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
ac7b0415ba
|
1083 添加枚举字段
|
6 years ago |
汪云昊
|
5c67a7bb5f
|
MySQL 数据库不支持 CAST AS DOUBLE，需要改成 CAST AS DECIMAL
|
6 years ago |
|
王杰
|
fa25769c50
|
mes枚举
|
6 years ago |
|
王杰
|
0d0178545c
|
mes设备
|
6 years ago |
|
WYnneaoapc
|
e8336c85d7
|
idea 异常 文件格式化
|
6 years ago |
jokelone
|
7139d9b5f1
|
解决冲突
|
6 years ago |
|
jokelone
|
9e4930968f
|
解决冲突
|
6 years ago |
|
jokelone
|
8a517bc0b9
|
返厂返修增加字段
|
6 years ago |
crish
|
0fdabe4950
|
知识库 ，自处理开发
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
 曾贞一
|
e603ac66a7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
5a036f14cb
|
mes设备作业任务
|
6 years ago |
|
jokelone
|
7fc439319e
|
返厂返修
|
6 years ago |
陆卫豪
|
413266293e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
030391a93c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
56d7457826
|
工位监控提交
|
6 years ago |
|
曾贞一
|
5e7fb00d0c
|
【生产领料】
|
6 years ago |
许心洁
|
1f1b4f7511
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
48a6cdc39c
|
作业任务：作业类型 枚举增加
|
6 years ago |
|
crish
|
e260045c42
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
crish
|
97763d6b53
|
安灯广播， 安灯管理显示不同界面， 添加操作来源字段
|
6 years ago |
|
王杰
|
b561110e54
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9cc89f9397
|
mes设备周期计划
|
6 years ago |
|
许心洁
|
2f843a8f5a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
986157043d
|
流程设计：新增组件参数类型：可配字符串
|
6 years ago |
|
王杰
|
611b25abfd
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
d91fa61c88
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
6c1891c193
|
软适配报文状态及微服务接口调整
|
6 years ago |
|
wei.peng
|
05fd0fe686
|
WebService Server 优化完成
|
6 years ago |
|
许心洁
|
7863325afd
|
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
|
6 years ago |
|
许心洁
|
b7b78b85ac
|
误拉了test分支的代码：还原
|
6 years ago |
|
许心洁
|
d351c36ffc
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
c681340355
|
工位监控添加枚举一字段
|
6 years ago |
|
汪云昊
|
52a5fe74af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
029f14d36f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java
|
6 years ago |
刘辉
|
83a7a9e988
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
d9dd10761e
|
WebService 欧洲对接完成
|
6 years ago |
|
王杰
|
2ed8ebdbd7
|
Merge branch 'dev' into test
|
6 years ago |
changjiang.gao
|
0e7c7fbfb2
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
45b4264c67
|
导出显示bug修改
|
6 years ago |
|
jokelone
|
1758a4e50e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a79769d229
|
mes-pcn枚举
|
6 years ago |
|
王杰
|
37f7e92d53
|
mes实体类
|
6 years ago |
|
许心洁
|
8deff73454
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
508d4b5aba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
|
6 years ago |
|
汪云昊
|
d83de01d33
|
服务端适配日志bug解决
|
6 years ago |
|
刘辉
|
722146acd8
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |