From 2fe791b0054a29abed3177e24de70fdb59de2cc6 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 三月 2024 16:47:49 +0800
Subject: [PATCH] xg
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 5 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 7 ++++++-
4 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 9d435f7..6232df8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -306,11 +306,13 @@
private List<EquipmentProcessParameters> processEditTableList;
@TableField(exist = false)
private List<EquipmentPrecisionParameters> precisionEditTableList;
+ /**宸ュ尯*/
@Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
@Excel(width = 15,dicCode = "id",dictTable = "mom_base_area",dicText = "name",orderNum = "39", name = "宸ュ尯")
private String factoryModelId;
+ /**涓績*/
@Excel(width = 15,dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "浜х嚎",orderNum = "40")
- @Dict(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name")
+ @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
private String workCenterId;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 15,orderNum = "37",format = "yyyy-MM-dd")
@@ -403,6 +405,9 @@
private String equipmentId;
@TableField(exist = false)
private List<Equipment> keyEquipmentUpdateList;
+ /**宸ユ*/
+ @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
+ private String areaId;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
index 5f134ef..a989f0c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
@@ -72,6 +72,7 @@
@Param("model")String model,
@Param("workCenterId")String workCenterId,
@Param("factoryModelId")String factoryModelId,
+ @Param("areaId")String areaId,
@Param("manageId")String manageId,
@Param("useId")String useId,
@Param("equipmentImportanceId")String equipmentImportanceId,
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index f1dd971..5955ab9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -254,6 +254,7 @@
t1.id showId,
t1.is_line_equip isLineEquip,
t1.is_judging isJudging,
+ t1.area_id areaId,
t3.sumOfEquipment
from mom_eam_equipment t1
left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
@@ -274,6 +275,10 @@
<if test="workCenterId != null and workCenterId != ''">
and t1.work_center_id = #{workCenterId}
</if>
+-- 鏍规嵁areaId鏌ヨ璁惧
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
+ </if>
<if test="factoryModelId != null and factoryModelId != ''">
and t1.factory_model_id = #{factoryModelId}
</if>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 130b407..713e1ae 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -115,6 +115,7 @@
equipment.getModel(),
equipment.getWorkCenterId(),
equipment.getFactoryModelId(),
+ equipment.getAreaId(),
equipment.getManageId(),
equipment.getUseId(),
equipment.getEquipmentImportanceId(),
--
Gitblit v1.9.3