From 5677ab158fb78d1267c16bbbf29eb690e0b4039f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:53:39 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index a4c2b51..bde0eee 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -74,6 +74,9 @@
@Resource
private IEquipmentLogService equipmentLogService;
+ @Resource
+ private IEquipmentBaseInfoService equipmentBaseInfoService;
+
@Override
public Map<String, String> getDepNamesByEquipmentIds(List<String> equipmentIds) {
List<MdcEquipmentDepVo> list = this.baseMapper.getDepNamesByEquipmentIds(equipmentIds);
@@ -372,6 +375,15 @@
mdcEquipmentDto.setSequencenumber(dto.getSequencenumber());
mdcEquipmentDto.setExecutingcode(dto.getExecutingcode());
mdcEquipmentDto.setProductName(dto.getProductName());
+ if ("LSV2".equals(mdcEquipment.getDriveType())) {
+ mdcEquipmentDto.setSpindlebeilv(dto.getSFeed());
+ mdcEquipmentDto.setFeedbeilv(dto.getFFeed());
+ mdcEquipmentDto.setRapidfeed(dto.getRapidfeed());
+ mdcEquipmentDto.setNCVersion(dto.getNCVersion());
+ mdcEquipmentDto.setTNCVersion(dto.getTNCVersion());
+ mdcEquipmentDto.setOPTVersion(dto.getOPTVersion());
+ mdcEquipmentDto.setPLCVersion(dto.getPLCVersion());
+ }
//鑾峰彇 MDC 椹卞姩瀵瑰簲鐨勫睍绀哄弬鏁� 骞舵牴鎹甼ey 鎷艰浠� workData 鏌ヨ鐨勬暟鎹�
List<MdcDriveTypeParamConfig> mdcDriveTypeParamList = mdcDriveTypeParamConfigService.getShowDriveParam(mdcEquipment.getDriveType());
@@ -415,6 +427,11 @@
}
mdcEquipmentDto.setMdcDriveTypeParamConfigList(mdcDriveTypeParamList);
}
+ EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
+ if (equipmentBaseInfo != null) {
+ mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
+ mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
+ }
}
}
return mdcEquipmentDto;
--
Gitblit v1.9.3