wei.peng
|
0e79a6cdc9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
7831940c2a
|
FastDfs 添加日志
|
6 years ago |
许心洁
|
c99125b1a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
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 |
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 |
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 |
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 |
|
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 |
|
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 |
|
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 |
|
许心洁
|
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 |
|
jiajack
|
564de0acdd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
9be4b8a7d0
|
工位程序业务编写
|
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 |
|
yihang.lv
|
458cf3610f
|
sweb 订单发布修改子表状态
|
6 years ago |
|
许心洁
|
7cce6b828f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
9a4323614c
|
流程新增与流程设计分开
|
6 years ago |
|
crish
|
8c443c3afb
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
d6221c39ae
|
生产模块bug修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
柯裕
|
e8238796c3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
72ac3490e4
|
ANDON枚举
|
6 years ago |
|
yihang.lv
|
256c688304
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
b4f07905e5
|
sweb 发布列表修改，按天发布
|
6 years ago |
|
Silliter
|
e2ce7c5ce9
|
物理按灯开发
|
6 years ago |
|
Silliter
|
dbfae39ea6
|
安灯项目优化
|
6 years ago |
|
柯裕
|
44e2a13ff5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
b56994fcca
|
ANDON更新
|
6 years ago |
|
Silliter
|
6b295aaace
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |