60f441e685
Merge branch 'dev' into test
6 years ago
18ec7d091a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c9a572469c
同步限制解除
6 years ago
60d1798b9c
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
ddfb47e6ac
mes设备台账功能开发
6 years ago
6c434e114d
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
4eada1c343
表同步
6 years ago
e35cf183da
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
82fe491bd3
#1050 工位监控
6 years ago
30eee05b1c
Merge branch 'dev' into test
6 years ago
766d195088
开线合并代码
6 years ago
183fd78eac
冲突解决
6 years ago
王杰
80f50fe800
Merge branch 'dev' into test
6 years ago
王杰
804574090f
pcn生产工单
6 years ago
f07764acda
Merge branch 'dev' into test
6 years ago
王杰
80bad03881
mes-pcn生产工单
6 years ago
f96cbd1be3
Merge branch 'dev' into test
6 years ago
033b23321f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7c472b386a
提交
6 years ago
6250794847
Merge branch 'dev' into test
6 years ago
王杰
704d4f2098
mes生产工单
6 years ago
王杰
f24744a1f6
Merge branch 'dev' into test
6 years ago
王杰
e5a20d4733
生产工单
6 years ago
cbc5882bd5
Merge branch 'dev' into test
6 years ago
王杰
d676bcf974
mes生产工单下达配置状态
6 years ago
4b17c6ca69
Merge branch 'dev' into test
6 years ago
王杰
310d0f0606
mes生产工单审批
6 years ago
4d5497929a
Merge branch 'dev' into test
6 years ago
王杰
9b82b0be2a
mes班组维护
6 years ago
c47c617aab
Merge branch 'dev' into test
6 years ago
王杰
8570b88761
mes生产工单
6 years ago
c17039ce4a
Merge branch 'dev' into test
6 years ago
4e1635fe7e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9b0c5de954
提交
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
52a770ad45
Merge branch 'dev' into test
6 years ago
王杰
24a31c0bdf
生产工单实体
6 years ago
03a5481210
Merge branch 'dev' into test
6 years ago
王杰
9ed873422e
mes生产计划
6 years ago
f6bb2ee21f
Merge branch 'dev' into test
6 years ago
王杰
2460fbc3b4
生产计划
6 years ago
23c59d4326
Merge branch 'dev' into test
6 years ago
271a26d2b8
提交
6 years ago
ad9f532cd7
Merge branch 'dev' into test
6 years ago
f51ba09666
提交
6 years ago
ee979c6e02
Merge branch 'dev' into test
6 years ago
王杰
f5164d82fb
通用查询方法
6 years ago
35beb0c60e
Merge branch 'dev' into test
6 years ago
王杰
58d6305bd3
mes动作
6 years ago
4a1ad40dfa
Merge branch 'dev' into test
6 years ago
王杰
c950019077
pcn定时任务
6 years ago
ccffe9b7bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
61a7985afc
提交 0905
6 years ago
546d9dc7a5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
61ed3d821d
提交 0905
6 years ago
fd76f08af4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
d2995520d4
mes-pcn定时任务增加字段
6 years ago
4b982fc4fe
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1332f11a23
提交
6 years ago
8f1ac3fdae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
65cb39d7ba
工作中心代码修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
2e8a70d8b4
pom版本还原--pojo
6 years ago
王杰
46d220f3ec
mes条码规则校验
6 years ago
cbcdcabd82
测试修改提交
6 years ago
7f3f39af06
提交
6 years ago
63c0f02f32
提交
6 years ago
146cf768d6
提交
6 years ago
王杰
2e86ff81d0
mes工作单元参数增加枚举
6 years ago
王杰
09eee24769
mes工作单元参数CRUD
6 years ago
王杰
8034e104c8
mes工作单元参数
6 years ago
王杰
5388c4405b
mes-pcn-task表修改
6 years ago
6e5176c3fc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9981c4089b
修改唯一性校验， 不能新增禁用的信息
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
王杰
6929e88570
mes-pcn定时任务
6 years ago
71e7362216
PCN数据同步， 逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
3bedf8fb8d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
6 years ago
953f593207
提交
6 years ago
王杰
12f6e2c14b
mes-pcn定时任务表维护
6 years ago
c584f2e048
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
12a2a27b18
mes， pcn条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
王杰
b375983304
mes条码生成规则CURD及mesbug修复
6 years ago
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2deb384cca
提交
6 years ago
5e72d98ad8
提交
6 years ago
王杰
60eadfac7a
mes维护页面加模糊查询
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1328dc7ddd
#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
王杰
e4aadf35ed
mes生产工单页面按钮控制
6 years ago
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
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
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
7 years ago
2b59998d16
新增mes-pcn同步配置基础数据
7 years ago
d7ba3d445a
MES数据同步-POJO调整
7 years ago
28ae6cf85d
Merge remote-tracking branch 'origin/dev' into test
7 years ago
e874862455
socket动态配置
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
a37b9b60aa
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
5e46ecfe13
MES流程配置第一次完整测试JIT队列修改
7 years ago
67e3851a86
Merge branch 'dev' into test
7 years ago
5a044130ea
MES和MES-PCN产品条码PRODUCT_SN对象属性统一+WMS流程组件去工厂
7 years ago
ae4b32251a
WMS【添加“重新推送未处理的移动单到队列”接口+BUG修复：定时处理错误移动单查询移动单没有加上工厂代码+QC推送队列直接放了一整个对象导致交易处理主程序无法解析】MES【JIT队列execute方法+条码校验工步】
7 years ago
9eb207145c
Merge branch 'dev' into test
7 years ago
ebfee3d774
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
d3d25f0baa
Pcn节点向Mes主服务注册机制代码编写
7 years ago
a152d8d565
Merge branch 'dev' into test
7 years ago
1f6eb341cd
修改报错
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
43c2dd4092
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
63ddfd5a53
MES新增基础数据查询条件
7 years ago
d714733a27
Merge branch 'dev' into test
7 years ago
9200080178
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
7 years ago
e24e7ef421
Merge branch 'dev' into test
7 years ago
76e553234e
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
7 years ago
8afe54af50
Merge branch 'dev' into test
7 years ago
85c4f94dcb
MES model转移至pojo-mes目录下
7 years ago
78145e44e4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
26fc821d1a
MES model修改
7 years ago
68c8c62542
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
93ace83b5f
长文本数据类型
7 years ago
5fc11292ea
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
280f9a2233
MES新增班次休息表、物料关键数据关系表
7 years ago
bdff2c3e2f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
8e2e1f6543
MES：流程配置添加工序，工步基础数据接口
7 years ago
ac42a9eb37
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
090fdca183
MES新增客户零件关系
7 years ago
440083b5f2
Merge branch 'dev' into test
7 years ago
7c7fb30e1a
MES新增设备查询条件
7 years ago
2d3cc6ea2b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
WYnneaoapc
刘辉
王杰
陆卫豪
许心洁
jenkins
crish
曾贞一
于学杰
jimmy.zeng
peter.pan
jenkins
wei.peng
yiming.gu
汪云昊
allen.zhang
jiajack
Silliter