汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
Silliter
|
ac42a9eb37
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yiming.gu
|
090fdca183
|
MES新增客户零件关系
|
6 years ago |
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
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 |
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 |
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
|
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 |
|
jenkins
|
7c20f070e4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
crish
|
d6221c39ae
|
生产模块bug修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
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 |
|
jenkins
|
41f03a13d8
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
6 years ago |
|
Silliter
|
29b605c749
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jiajack
|
9137fe9c4f
|
工位程序业务编写
|
6 years ago |
|
jenkins
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
crish
|
5daf6d960f
|
hqpPack优化
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
f8b89c930b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
jenkins
|
2f57ee75d5
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
crish
|
7fc2fe8914
|
生产计划，生产工单，生产队列
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
c8c8dc6750
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
e4c1f3ae72
|
生产队列
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jenkins
|
ff991142ae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
3d56e2539d
|
合并dev代码
|
6 years ago |
|
crish
|
85ae1e2455
|
生产工单接口开发
|
6 years ago |
|
crish
|
34e6d97b27
|
生产工单
|
6 years ago |
|
jenkins
|
fb4be4580d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yiming.gu
|
3112e5e72c
|
生产工单实体添加注解
|
6 years ago |