483ea59142
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
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
7002ac5a8a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ecba29948f
816 add method
6 years ago
78267a3a45
Merge remote-tracking branch 'remotes/origin/dev' into test
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
曾贞一
7ca6e46e4b
Merge branch 'dev' into test
6 years ago
0e444aa993
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
f30a40520b
Merge branch 'dev' into test
6 years ago
d826c47d5a
修改了mesEvent pojo
6 years ago
曾贞一
8b457c0618
DEV 合并 TEST pom.xml文件修改
6 years ago
e7913cfb26
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
6 years ago
3dca11a963
add a hql
6 years ago
d45b7b77f3
Merge branch 'dev' into test
6 years ago
33a59fdb0f
0730 add esop pojo and respository
6 years ago
25fc477991
Merge remote-tracking branch 'origin/dev' into test
6 years ago
e9b1d7e595
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
6 years ago
9c201c70e8
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
8a0ecfbaa9
新增mes查询条件
6 years ago
c07858d5ba
Merge remote-tracking branch 'remotes/origin/dev' into test
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
28ae6cf85d
Merge remote-tracking branch 'origin/dev' into test
6 years ago
e874862455
socket动态配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
a37b9b60aa
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5e46ecfe13
MES流程配置第一次完整测试JIT队列修改
6 years ago
67e3851a86
Merge branch 'dev' into test
6 years ago
5a044130ea
MES和MES-PCN产品条码PRODUCT_SN对象属性统一+WMS流程组件去工厂
6 years ago
ae4b32251a
WMS【添加“重新推送未处理的移动单到队列”接口+BUG修复：定时处理错误移动单查询移动单没有加上工厂代码+QC推送队列直接放了一整个对象导致交易处理主程序无法解析】MES【JIT队列execute方法+条码校验工步】
6 years ago
9eb207145c
Merge branch 'dev' into test
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
a152d8d565
Merge branch 'dev' into test
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
d714733a27
Merge branch 'dev' into test
6 years ago
9200080178
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
6 years ago
e24e7ef421
Merge branch 'dev' into test
6 years ago
76e553234e
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
6 years ago
8afe54af50
Merge branch 'dev' into test
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
68c8c62542
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
93ace83b5f
长文本数据类型
6 years ago
jimmy.zeng
WYnneaoapc
crish
曾贞一
于学杰
peter.pan
jenkins
许心洁
wei.peng
yiming.gu
汪云昊
allen.zhang
jiajack