 钮海涛
|
0450e2665a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
d69c8e682b
|
销售订单拆分下发。
|
4 years ago |
puxiao.liao
|
31344a9317
|
代码合并
|
4 years ago |
|
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 |
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
|
puxiao.liao
|
e44798bd4a
|
代码合并
|
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 |
|
Wynne
|
0dd2f3b3c3
|
通用界面 requestmodel修改方法组id
|
4 years ago |
|
puxiao.liao
|
4b1228fbbc
|
代码回滚
|
4 years ago |
|
钮海涛
|
8b3bdc40fe
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
c8074d219a
|
延期订单问题修复
|
4 years ago |
|
puxiao.liao
|
c4a691ecb9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
jun
|
1b3b5ea6a5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
21a3e58b0c
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
nies
|
3bfb61178b
|
修改MES_QC_CHECK_TYPE
|
4 years ago |
|
nies
|
88781e7831
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
nies
|
4850f4ccc2
|
新增tms的SOFT_TYPE
|
4 years ago |
|
jun
|
d0c62b9b2d
|
16909 19081-生产报废单导入XLS后，单据类型是【隔离报废】，而不是正常的【生产报废单】
|
4 years ago |
|
puxiao.liao
|
b44e02cdf6
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
jhh2579
|
f4e6c63956
|
中航工序外协检
|
4 years ago |
|
puxiao.liao
|
4de836b28a
|
质检明细状态增加选别
|
4 years ago |
|
nies
|
5da810fb20
|
Merge branch 'test' into dev
|
4 years ago |
|
钮海涛
|
5b41f25711
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
13d015e79a
|
工序间最大间隔限制调整前
|
4 years ago |
|
Wynne
|
55af273ea7
|
feat(Screen): 界面回显
界面回显
|
4 years ago |
|
puxiao.liao
|
e4b7159fc7
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
804401e12c
|
修复枚举导出异常
|
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
|
f0c0a4038c
|
ua配置
|
4 years ago |
|
wynne1005
|
d8ad92fe24
|
merge test 还原pom
|
4 years ago |
|
wynne1005
|
08a0ca7937
|
merge dev 还原pom
|
4 years ago |
|
wynne1005
|
8cb6abc09d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
c55875e129
|
feat(screen): 7.7 通用界面与前端完成回显
7.7 通用界面与前端完成回显
|
4 years ago |
 王杰
|
c22117f395
|
Merge branch 'test' into dev
|
4 years ago |
|
puxiao.liao
|
70ec23db12
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
72a2a24cf7
|
用户信息优化
|
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
|
d96f4b5d74
|
16496 19081-设备管理调整-
|
4 years ago |
|
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
|
wynne1005
|
0e21856803
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
85b922d492
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
42fb211a26
|
625 数据对象更新
|
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 |
|
钮海涛
|
76af5bc47d
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
7109cc8acb
|
生产计划下发到MES
|
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 |
|
王杰
|
1f1acc05a3
|
Merge branch 'test' into ext-dev
|
4 years ago |