 王杰
|
71d39f54d2
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
c595d3f6b1
|
修改字段
|
6 years ago |
陆卫豪
|
d6ff7aa2b1
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
jokelone
|
054502b657
|
【任务：1193接口调试】
|
6 years ago |
jenkins
|
8eb8c2f97e
|
Merge branch 'master' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
9f9c095846
|
Merge branch 'dev' into test
|
6 years ago |
WYnneaoapc
|
4441d1dc86
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
WYnneaoapc
|
88d480403c
|
数据库字段初始化属性 赋值longtext
|
6 years ago |
|
王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
9baac06cb7
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
e91369c82a
|
【需求：1198】
|
6 years ago |
|
王杰
|
7a023d0f4b
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
fe962c1ab3
|
【bug:6483】
|
6 years ago |
|
王杰
|
3c3de49512
|
【bug:6483】
|
6 years ago |
|
王杰
|
7f08847c50
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
6297ccc4d7
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
5e813f30e7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
f632308d0a
|
【任务：1193接口数据解析】
|
6 years ago |
|
王杰
|
2a5c32b8ea
|
解决冲突
|
6 years ago |
wei.peng
|
02a9c64a42
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jokelone
|
987a502d7e
|
【bug：6380 物料字段拼写有误】
|
6 years ago |
|
陆卫豪
|
4a76c480ac
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
6 years ago |
|
jenkins
|
4d2a2a35b0
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
f6d50bdfb7
|
【需求：1167，产品批量打包】
|
6 years ago |
|
王杰
|
693ac2451e
|
【需求：1167，产品批量打包】
|
6 years ago |
|
王杰
|
1a7164c474
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
b15c3f4ae7
|
【需求：1101，定时任务优化】
|
6 years ago |
|
jokelone
|
9842ed2181
|
【任务：1193接口pojo】
|
6 years ago |
|
王杰
|
e60256e291
|
【需求：1167，包装特殊批次工步】
|
6 years ago |
crish
|
5b6b303722
|
Merge branch 'test'
|
6 years ago |
|
crish
|
17d5f1e512
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
2660e0268e
|
【需求：1198，代码优化】
|
6 years ago |
|
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
9137555226
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
028d7641d2
|
【需求：1126，设备周期计划优化】
|
6 years ago |
|
陆卫豪
|
3fa5437c5a
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
37e288ff77
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
|
6 years ago |
|
WYnneaoapc
|
360f908ae4
|
获取生产数据 6283
|
6 years ago |
|
王杰
|
da0478ec7e
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
ebb59cbb64
|
【需求:1167,批量打包】
|
6 years ago |
|
王杰
|
093008fae8
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
616d39fa38
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
246726a67d
|
【任务：1193 接口基础数据】
|
6 years ago |
|
jenkins
|
c1b50db526
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
49637cb23f
|
【需求:1167,批量打包】
|
6 years ago |
|
WYnneaoapc
|
c1c00213e1
|
工位监控修改 6283
|
6 years ago |
许心洁
|
60c25d7a71
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
许心洁
|
ccb29c5903
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
f5c8e36ac9
|
【需求：1189，产品条码工步】
|
6 years ago |
|
王杰
|
649ffb548d
|
Merge branch 'dev' into test
|
6 years ago |