许心洁
|
e9b1d7e595
|
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
|
6 years ago |
yiming.gu
|
8a0ecfbaa9
|
新增mes查询条件
|
6 years ago |
|
许心洁
|
32b0c5080d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
088dc7dfa4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
2b59998d16
|
新增mes-pcn同步配置基础数据
|
6 years ago |
|
许心洁
|
d7ba3d445a
|
MES数据同步-POJO调整
|
6 years ago |
crish
|
e874862455
|
socket动态配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
许心洁
|
5e46ecfe13
|
MES流程配置第一次完整测试JIT队列修改
|
6 years ago |
|
许心洁
|
5a044130ea
|
MES和MES-PCN产品条码PRODUCT_SN对象属性统一+WMS流程组件去工厂
|
6 years ago |
|
许心洁
|
ae4b32251a
|
WMS【添加“重新推送未处理的移动单到队列”接口+BUG修复：定时处理错误移动单查询移动单没有加上工厂代码+QC推送队列直接放了一整个对象导致交易处理主程序无法解析】MES【JIT队列execute方法+条码校验工步】
|
6 years ago |
jiajack
|
ebfee3d774
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
d3d25f0baa
|
Pcn节点向Mes主服务注册机制代码编写
|
6 years ago |
|
crish
|
1f6eb341cd
|
修改报错
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yiming.gu
|
43c2dd4092
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
63ddfd5a53
|
MES新增基础数据查询条件
|
6 years ago |
|
许心洁
|
9200080178
|
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
|
6 years ago |
|
许心洁
|
76e553234e
|
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
|
6 years ago |
|
yiming.gu
|
85c4f94dcb
|
MES model转移至pojo-mes目录下
|
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 |
汪云昊
|
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 |
|
许心洁
|
bdff2c3e2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
8e2e1f6543
|
MES：流程配置添加工序，工步基础数据接口
|
6 years ago |
|
yiming.gu
|
090fdca183
|
MES新增客户零件关系
|
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 |
|
许心洁
|
b5696a63f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
e79987d235
|
MES流程配置接口（流程，产品流程配置）
|
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
|
c60dd62f32
|
新增工步、工序、工步参数查询条件
|
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 |
|
crish
|
d6221c39ae
|
生产模块bug修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yiming.gu
|
68a66c67b0
|
设备pojo新增工作中心代码，区域代码
|
6 years ago |
|
yiming.gu
|
15b5edfaec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
b1f513d786
|
新增设备pojo，组织模型model
|
6 years ago |
|
crish
|
dd477bdf94
|
生产计划
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
571ad144b7
|
解决冲突
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
c771fa925b
|
更改model位置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jiajack
|
9137fe9c4f
|
工位程序业务编写
|
6 years ago |
|
crish
|
5daf6d960f
|
hqpPack优化
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yiming.gu
|
a1a63c2247
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
feace14920
|
PCN同步MES主数据
|
6 years ago |
|
crish
|
7fc2fe8914
|
生产计划，生产工单，生产队列
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
e4c1f3ae72
|
生产队列
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
85ae1e2455
|
生产工单接口开发
|
6 years ago |