 曾贞一
|
6c8cfd8678
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
|
crish
|
52a770ad45
|
Merge branch 'dev' into test
|
6 years ago |
 王杰
|
24a31c0bdf
|
生产工单实体
|
6 years ago |
于学杰
|
f6bb2ee21f
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
2460fbc3b4
|
生产计划
|
6 years ago |
|
crish
|
23c59d4326
|
Merge branch 'dev' into test
|
6 years ago |
WYnneaoapc
|
271a26d2b8
|
提交
|
6 years ago |
|
crish
|
bbfc9b320f
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
c950019077
|
pcn定时任务
|
6 years ago |
jimmy.zeng
|
ccffe9b7bd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
WYnneaoapc
|
c44a99eb40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
89b0a4a68a
|
条码打印调试
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
王杰
|
fe455a7147
|
pcn离线登陆
|
6 years ago |
|
WYnneaoapc
|
546d9dc7a5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
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 |
|
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 |
|
王杰
|
46d220f3ec
|
mes条码规则校验
|
6 years ago |
|
crish
|
5e06022e51
|
Merge remote-tracking branch 'remotes/origin/dev'
|
6 years ago |
|
王杰
|
8034e104c8
|
mes工作单元参数
|
6 years ago |
|
王杰
|
5388c4405b
|
mes-pcn-task表修改
|
6 years ago |
|
王杰
|
d7ddf4d5a0
|
mes-pcn定时任务数据同步日志表修改类型
|
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 |
|
王杰
|
5947f88da1
|
mes-pcn定时任务工作清单数据同步
|
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 |
|
crish
|
f820c449bb
|
工步条码打印
Signed-off-by: crish <570360737@qq.com>
|
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
|
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
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
WYnneaoapc
|
2deb384cca
|
提交
|
6 years ago |
|
曾贞一
|
b10b967b73
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |