许心洁
|
76e553234e
|
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
|
6 years ago |
柯裕
|
3f961e7923
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
00086912bc
|
ANDON实体更新
|
6 years ago |
allen.zhang
|
8afe54af50
|
Merge branch 'dev' into test
|
6 years ago |
yiming.gu
|
08d0b32ea3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
85c4f94dcb
|
MES model转移至pojo-mes目录下
|
6 years ago |
|
柯裕
|
b581cbee63
|
ANDON实体更新
|
6 years ago |
|
yiming.gu
|
78145e44e4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
26fc821d1a
|
MES model修改
|
6 years ago |
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
crish
|
ce864025e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
d0840978de
|
PLC数据采集优化
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
yihang.lv
|
21c60292bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
245596ee0b
|
sweb 导入非标准包装修改
|
6 years ago |
|
汪云昊
|
93ace83b5f
|
长文本数据类型
|
6 years ago |
|
yiming.gu
|
5fc11292ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
280f9a2233
|
MES新增班次休息表、物料关键数据关系表
|
6 years ago |
alwaysfrin
|
41a8adcea2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
309f3f2282
|
事务调整及demo
|
6 years ago |
wei.peng
|
302ac8a7e8
|
初始化功能目录
|
6 years ago |
|
许心洁
|
bdff2c3e2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
8e2e1f6543
|
MES：流程配置添加工序，工步基础数据接口
|
6 years ago |
|
柯裕
|
d9b263d10c
|
ANDON_HQLPACK更新
|
6 years ago |
|
allen.zhang
|
44abb90fe4
|
Merge branch 'dev' into test
|
6 years ago |
jiajack
|
550f2132e3
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java
|
6 years ago |
|
jiajack
|
21f6d4eaf8
|
PLC配置
|
6 years ago |
Silliter
|
ac42a9eb37
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
5841ae2ed2
|
错误文件修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yiming.gu
|
623dfed52b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
090fdca183
|
MES新增客户零件关系
|
6 years ago |
|
crish
|
072bccc0e5
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
7caec34dad
|
PLC设备配置实体
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
柯裕
|
171675ffb7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
2e4f792afa
|
ANDON更新
|
6 years ago |
|
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
6 years ago |
|
alwaysfrin
|
65b5ac3803
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
cc02090910
|
事务调整及demo
|
6 years ago |
|
alwaysfrin
|
d00c228823
|
事务调整及demo
|
6 years ago |
|
Silliter
|
05baaba8da
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
Silliter
|
630ad20587
|
开发安灯呼叫升级定时任务
|
6 years ago |
|
crish
|
018d4a0404
|
PLC数据采集实体
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
7374fd34bb
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
e22ecf30ef
|
添加字段
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
df02c5d1b2
|
开发安灯呼叫升级定时任务
|
6 years ago |
|
yiming.gu
|
6405bcefcb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
7c7fb30e1a
|
MES新增设备查询条件
|
6 years ago |
|
yiming.gu
|
2d3cc6ea2b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
316077d263
|
MES新增工序流程工作单元对应表
|
6 years ago |
|
柯裕
|
5b041db0c9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
021e308a9e
|
ANDON实体更新
|
6 years ago |