From aed7113be920129211fd7cd63c963301bbf40581 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 15 一月 2025 16:38:04 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 1 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPartProcessInfo.java | 8 ++++----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 31 ++++++++++++++++---------------
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPartProcessInfo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPartProcessInfo.java
index 79e971f..b4792d7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPartProcessInfo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPartProcessInfo.java
@@ -34,19 +34,19 @@
/**
* 璁惧缂栧彿
*/
- @Excel(name = "璁惧缂栧彿", width = 15)
+ @Excel(name = "璁惧缂栧彿", width = 20)
@ApiModelProperty(value = "璁惧缂栧彿")
private String equipmentId;
/**
* 闆朵欢鍙�
*/
- @Excel(name = "闆朵欢鍙�", width = 15)
+ @Excel(name = "闆朵欢鍙�", width = 20)
@ApiModelProperty(value = "闆朵欢鍙�")
private String partId;
/**
* 鏍囧噯鍔犲伐鏃堕暱锛坢in锛�
*/
- @Excel(name = "鏍囧噯鍔犲伐鏃堕暱锛坢in锛�", width = 15)
+ @Excel(name = "鏍囧噯鍔犲伐鏃堕暱锛坢in锛�", width = 20)
@ApiModelProperty(value = "鏍囧噯鍔犲伐鏃堕暱锛坢in锛�")
private Integer standardProcessLong;
/**
@@ -64,7 +64,7 @@
/**
* 鍔犲伐鎬绘椂闀�(min)
*/
- @Excel(name = "鍔犲伐鎬绘椂闀�(min)", width = 15)
+ @Excel(name = "鍔犲伐鎬绘椂闀�(min)", width = 18)
@ApiModelProperty(value = "鍔犲伐鎬绘椂闀�(min)")
private Integer totalProcessLong;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 0d8024e..4cd73de 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -107,6 +107,7 @@
<foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
+ ORDER BY t1.equipment_id
</select>
<!--鏍规嵁閮ㄩ棬id鏌ヨ璁惧id闆嗗悎-->
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 9795fa8..565ccfa 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
@@ -463,23 +463,24 @@
}
result.put("runData", runData);
- //鍧愭爣淇℃伅
// 鏌ヨ鍧愭爣淇℃伅
- EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipmentDetailedDto.getEquipmentId());
- if (equipmentXYZ != null) {
- Map<String, Object> map = new HashMap<>();
- map.put("xmachine", equipmentXYZ.getXMachine());
- map.put("ymachine", equipmentXYZ.getYMachine());
- map.put("zmachine", equipmentXYZ.getZMachine());
- map.put("amachine", equipmentXYZ.getAMachine());
- map.put("bmachine", equipmentXYZ.getBMachine());
+ if (!mdcEquipmentDetailedDto.getDriveType().equals("ZUOLAN") || !mdcEquipmentDetailedDto.getDriveType().equals("CurrentState")) {
+ EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipmentDetailedDto.getEquipmentId());
+ if (equipmentXYZ != null) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("xmachine", equipmentXYZ.getXMachine());
+ map.put("ymachine", equipmentXYZ.getYMachine());
+ map.put("zmachine", equipmentXYZ.getZMachine());
+ map.put("amachine", equipmentXYZ.getAMachine());
+ map.put("bmachine", equipmentXYZ.getBMachine());
- map.put("xabsolute", equipmentXYZ.getXAbsolute());
- map.put("yabsolute", equipmentXYZ.getYAbsolute());
- map.put("zabsolute", equipmentXYZ.getZAbsolute());
- map.put("aabsolute", equipmentXYZ.getAAbsolute());
- map.put("babsolute", equipmentXYZ.getBAbsolute());
- result.put("xyzList", map);
+ map.put("xabsolute", equipmentXYZ.getXAbsolute());
+ map.put("yabsolute", equipmentXYZ.getYAbsolute());
+ map.put("zabsolute", equipmentXYZ.getZAbsolute());
+ map.put("aabsolute", equipmentXYZ.getAAbsolute());
+ map.put("babsolute", equipmentXYZ.getBAbsolute());
+ result.put("xyzList", map);
+ }
}
}
--
Gitblit v1.9.3