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.
杨万里 5d87f49468 Merge branch 'master' of http://1.13.177.47:3000/Yangwl/lanju-cloud
# Conflicts:
#	op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
#	op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java
#	op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
1 month ago
..
op-device 备品备件出入库优化2 3 months ago
op-energy 电表整点数据无法导出和查询问题修复 2 months ago
op-file 问题修复22 1 year ago
op-gen 巡检报表4 1 year ago
op-job 新增留样复检任务提醒,留样复检任务触发OA流程 3 months ago
op-mes 生产日报表新增单箱电耗计算 2 months ago
op-open 设备异常提报修改 5 months ago
op-plan 生产工单报表排序调整 3 months ago
op-printservice 设备异常描述与设备类型绑定修改 7 months ago
op-quality 白坯检验后台报表调整 1 month ago
op-sap 库区填报 2 months ago
op-security 开发配置还原 1 year ago
op-system 调整缓存时间 6 months ago
op-technology 工艺路线同步方法修改,抽样算法修改优化。 5 months ago
op-wms Merge branch 'master' of http://1.13.177.47:3000/Yangwl/lanju-cloud 1 month ago
pom.xml 新增接口服务,去掉scada服务 2 years ago