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 |
|
Silliter
|
3111806b7b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
e31b35b6e3
|
安灯实体索引加入
|
6 years ago |
|
crish
|
7bd4ea8be9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
52d27b663b
|
扭矩采集
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
jenkins
|
21d3c053ca
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
许心洁
|
b5696a63f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
e79987d235
|
MES流程配置接口（流程，产品流程配置）
|
6 years ago |
|
柯裕
|
26693e107f
|
ANDON实体更新
|
6 years ago |
yihang.lv
|
11d42b3221
|
Merge branch 'dev' into test
|
6 years ago |
jiajack
|
564de0acdd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
9be4b8a7d0
|
工位程序业务编写
|
6 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yiming.gu
|
2ac8437b76
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
c60dd62f32
|
新增工步、工序、工步参数查询条件
|
6 years ago |
|
Silliter
|
251ce84d73
|
开发安灯呼叫升级定时任务
|
6 years ago |
|
yihang.lv
|
40b0dc430e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
c5a4a5c023
|
sweb 订单按天发布
|
6 years ago |
|
Silliter
|
37a4e42a87
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
c1949e099c
|
开发安灯呼叫升级定时任务
|
6 years ago |
alwaysfrin
|
7edd35e688
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
c8240076bc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
7db7dee50c
|
sweb 订单发布状态取子表
|
6 years ago |
wei.peng
|
aafa463afc
|
添加英文的时候字段长度不够，修改字段类型
|
6 years ago |
|
柯裕
|
1d945dbc04
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
d3be2fb6df
|
ANDON更新
|
6 years ago |
|
alwaysfrin
|
4b2a19a3fb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
刘敏
|
a8c2474397
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
刘敏
|
b90139312c
|
条码管控枚举添加
|
6 years ago |
|
Silliter
|
ad28d11486
|
安灯项目优化
|
6 years ago |
|
alwaysfrin
|
a1ccd25594
|
事务调整及demo
|
6 years ago |
|
Silliter
|
b70069e7ce
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
791d6084bc
|
安灯看板开发
|
6 years ago |
|
yiming.gu
|
2eb732c7df
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
|
6 years ago |
|
yiming.gu
|
7c647c7844
|
1、班次pojo修改
2、andon项目新增组织模型基础数据
|
6 years ago |
|
jiajack
|
2617793d0f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
83fb4ab8c0
|
工位程序业务编写
|
6 years ago |
|
柯裕
|
c1bf54f9c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
5a3e2996c7
|
findMaxByProperties更新
|
6 years ago |
|
Silliter
|
42e8c4e960
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
7d762dac6a
|
按灯系统配置开发
|
6 years ago |
|
yihang.lv
|
73330e3ba4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |