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
crish
王杰
jimmy.zeng
WYnneaoapc
曾贞一