ef1450e912
Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
ecba29948f
816 add method
6 years ago
0f99cb1027
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5df9896258
维修， 报废， 系统配置， pcn节点基础数据接口
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
66e20acfe9
0730 Add File Operation in ODS Module untested
6 years ago
0e444aa993
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
d826c47d5a
修改了mesEvent pojo
6 years ago
3dca11a963
add a hql
6 years ago
33a59fdb0f
0730 add esop pojo and respository
6 years ago
e9b1d7e595
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
6 years ago
8a0ecfbaa9
新增mes查询条件
6 years ago
32b0c5080d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
088dc7dfa4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2b59998d16
新增mes-pcn同步配置基础数据
6 years ago
d7ba3d445a
MES数据同步-POJO调整
6 years ago
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
ebfee3d774
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d3d25f0baa
Pcn节点向Mes主服务注册机制代码编写
6 years ago
1f6eb341cd
修改报错
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
43c2dd4092
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
63ddfd5a53
MES新增基础数据查询条件
6 years ago
9200080178
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
6 years ago
76e553234e
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
6 years ago
85c4f94dcb
MES model转移至pojo-mes目录下
6 years ago
78145e44e4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
26fc821d1a
MES model修改
6 years ago
93ace83b5f
长文本数据类型
6 years ago
5fc11292ea
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
090fdca183
MES新增客户零件关系
6 years ago
7c7fb30e1a
MES新增设备查询条件
6 years ago
2d3cc6ea2b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
564de0acdd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9be4b8a7d0
工位程序业务编写
6 years ago
c60dd62f32
新增工步、工序、工步参数查询条件
6 years ago
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
7c647c7844
1、班次pojo修改
...
2、andon项目新增组织模型基础数据
6 years ago
d6221c39ae
生产模块bug修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
68a66c67b0
设备pojo新增工作中心代码，区域代码
6 years ago
15b5edfaec
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b1f513d786
新增设备pojo，组织模型model
6 years ago
dd477bdf94
生产计划
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
WYnneaoapc
crish
许心洁
yiming.gu
jiajack
汪云昊