 曾贞一
|
56ce07632b
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
jimmy.zeng
|
ccffe9b7bd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
WYnneaoapc
|
61a7985afc
|
提交 0905
|
6 years ago |
|
曾贞一
|
410c1e8699
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
WYnneaoapc
|
546d9dc7a5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
61ed3d821d
|
提交 0905
|
6 years ago |
|
jimmy.zeng
|
fd76f08af4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
 王杰
|
d2995520d4
|
mes-pcn定时任务增加字段
|
6 years ago |
|
WYnneaoapc
|
4b982fc4fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
1332f11a23
|
提交
|
6 years ago |
|
曾贞一
|
0170831ef0
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
8f1ac3fdae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
crish
|
65cb39d7ba
|
工作中心代码修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
2e8a70d8b4
|
pom版本还原--pojo
|
6 years ago |
|
曾贞一
|
ee12ef1e12
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
王杰
|
46d220f3ec
|
mes条码规则校验
|
6 years ago |
|
jimmy.zeng
|
125988c3fe
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
WYnneaoapc
|
cbcdcabd82
|
测试修改提交
|
6 years ago |
|
曾贞一
|
221c8e59fb
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
73b6088977
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
WYnneaoapc
|
7f3f39af06
|
提交
|
6 years ago |
|
WYnneaoapc
|
63c0f02f32
|
提交
|
6 years ago |
|
WYnneaoapc
|
146cf768d6
|
提交
|
6 years ago |
|
曾贞一
|
9660f474c0
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
08b697a72e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
2e86ff81d0
|
mes工作单元参数增加枚举
|
6 years ago |
|
jimmy.zeng
|
06927a31bd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
09eee24769
|
mes工作单元参数CRUD
|
6 years ago |
|
王杰
|
8034e104c8
|
mes工作单元参数
|
6 years ago |
|
王杰
|
5388c4405b
|
mes-pcn-task表修改
|
6 years ago |
|
jimmy.zeng
|
154730e69b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
6e5176c3fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
9981c4089b
|
修改唯一性校验， 不能新增禁用的信息
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
王杰
|
6929e88570
|
mes-pcn定时任务
|
6 years ago |
|
曾贞一
|
ceac2db551
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
399a51b044
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
71e7362216
|
PCN数据同步， 逻辑修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
曾贞一
|
ae12af551b
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
1b06c1d07f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
WYnneaoapc
|
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 |
|
WYnneaoapc
|
953f593207
|
提交
|
6 years ago |
|
曾贞一
|
25e7ca08d3
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
59047b5b4c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
12f6e2c14b
|
mes-pcn定时任务表维护
|
6 years ago |
|
crish
|
f7b366fe29
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
c584f2e048
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
12a2a27b18
|
mes， pcn条码打印
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
曾贞一
|
18aff86ea0
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
6d925d6b9f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
b375983304
|
mes条码生成规则CURD及mesbug修复
|
6 years ago |