You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Yangwl d4b69d6bd0 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
10 months ago
..
op-device 设备模块功能更新 10 months ago
op-energy 增加清除数据源逻辑,质量来料、成品报告导出修改 10 months ago
op-file 问题修复22 1 year ago
op-gen 巡检报表4 2 years ago
op-job Merge branch 'lanju' 12 months ago
op-mes 增加清除数据源逻辑,质量来料、成品报告导出修改 10 months ago
op-open 设备模块功能更新 10 months ago
op-plan 数据源切换逻辑全框架优化,设备报修自动审核转维修单 10 months ago
op-quality 增加清除数据源逻辑,质量来料、成品报告导出修改 10 months ago
op-sap 增加清除数据源逻辑,质量来料、成品报告导出修改 10 months ago
op-security 开发配置还原 2 years ago
op-system 增加清除数据源逻辑,质量来料、成品报告导出修改 10 months ago
op-technology 烘房和成型机小时产量报表 1 year ago
op-wms Merge remote-tracking branch 'upstream/master' 10 months ago
pom.xml 新增接口服务,去掉scada服务 2 years ago