puxiao.liao
|
d7b34facf0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/pom.xml
modules/i3plus-pojo-mes-pcn/pom.xml
modules/i3plus-pojo-mes/pom.xml
modules/i3plus-pojo-model/pom.xml
modules/i3plus-pojo-platform/pom.xml
modules/i3plus-pojo-ptl/pom.xml
modules/i3plus-pojo-report/pom.xml
modules/i3plus-pojo-screen/pom.xml
modules/i3plus-pojo-softswitch/pom.xml
modules/i3plus-pojo-sweb/pom.xml
modules/i3plus-pojo-wms/pom.xml
modules/i3plus-pojo-workflow/pom.xml
pom.xml
sonar-project.properties
|
4 years ago |
joke.wang
|
db9dcabf1f
|
报工表增加索引
|
4 years ago |
Dominic_Xiao
|
69e2f819f2
|
16891 19081-EOL看板-19:00至00:00显示数据为0-20210730
|
4 years ago |
|
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
Wynne
|
7de40e37f5
|
Merge branch 'dev' into test
|
4 years ago |
|
Wynne
|
bd3dcbac3a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
af21429f34
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
4b1228fbbc
|
代码回滚
|
4 years ago |
|
Dominic_Xiao
|
91bd3d9021
|
北京隔离报废打印
|
4 years ago |
|
Dominic_Xiao
|
5a44baf73a
|
北京报废打印变更
|
4 years ago |
nies
|
5da810fb20
|
Merge branch 'test' into dev
|
4 years ago |
|
puxiao.liao
|
1a403dfefd
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
efbb51711e
|
16826 19081-备件计划导入功能增加数量选项，便于快速导入-20210723
|
4 years ago |
|
puxiao.liao
|
4250f215f2
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
a086d24203
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
d2ec6e27a5
|
条码注释掉版本字段
|
4 years ago |
|
puxiao.liao
|
e48341f47b
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
wynne1005
|
d8ad92fe24
|
merge test 还原pom
|
4 years ago |
|
wynne1005
|
08a0ca7937
|
merge dev 还原pom
|
4 years ago |
|
Dominic_Xiao
|
4297c59ef4
|
去除无效索引
|
4 years ago |
|
Dominic_Xiao
|
5c62f1b0d5
|
产线班次时段新增顺序字段
|
4 years ago |
|
Dominic_Xiao
|
adfec8957d
|
看板班次时段增加序号
|
4 years ago |
|
puxiao.liao
|
48fb24f3d7
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
2521606f5b
|
删掉无效索引
|
4 years ago |
|
puxiao.liao
|
ac535feab8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
370f4e9a02
|
强过报工定时任务
|
4 years ago |
|
puxiao.liao
|
59677dc00a
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
c3a018dc1f
|
零件消耗数量模型
|
4 years ago |
 王杰
|
a1fcd53e1f
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
王杰
|
c22117f395
|
Merge branch 'test' into dev
|
4 years ago |
|
王杰
|
257bd43a8f
|
对象结构增加plc代码
|
4 years ago |
|
puxiao.liao
|
11296ad9f1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
cfcb4bda03
|
设备故障现象增加上传图片
|
4 years ago |
|
puxiao.liao
|
9a952c4f3d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
c8b994a596
|
作业任务查询新增设备代码
|
4 years ago |
|
puxiao.liao
|
c842d3e5e5
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
nies
|
0cda9012f2
|
Merge branch 'test' into dev
|
4 years ago |
|
joke.wang
|
d325e01e0f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
7c67e954c7
|
设备任务上传文件
|
4 years ago |
|
Dominic_Xiao
|
9c94d857d7
|
泰国电检条码打印
|
4 years ago |
|
joke.wang
|
52f4ea0331
|
设备任务上传文件
|
4 years ago |
|
joke.wang
|
fd32eb6bf8
|
工装使用次数预警job
|
4 years ago |
|
joke.wang
|
d96f4b5d74
|
16496 19081-设备管理调整-
|
4 years ago |
|
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
|
puxiao.liao
|
7e8b0fdb42
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
3c42131f2b
|
16436 19081-PCN-返工返修-隔离-基于条码查询零件时-散件清单和物料bom，和增加物料名称查询条件
|
4 years ago |
陈思洁
|
e3a558913b
|
【3566 20063-鉴定报工-20210618】
|
4 years ago |
|
陈思洁
|
28474c8aba
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
王杰
|
fc8619208a
|
pom
|
4 years ago |
|
王杰
|
a71774ba24
|
pom
|
4 years ago |