From ae33e68baf21878ce145d75ac377d14c1e2b2a82 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 14:59:26 +0800
Subject: [PATCH] 设备台账
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 70ffd5e..9b570d0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -684,7 +684,7 @@
// exceptionNum++;
// }
else{
- SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
+ SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()).eq("del_flag",0),false);
if(ObjectUtils.isNotNull(use)){
equipment.setUseId(use.getId());
}else {
@@ -692,8 +692,8 @@
exceptionNum++;
continue;
}
- Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()));
- Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()));
+ Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0));
+ Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0));
if(ObjectUtils.isNotNull(area)){
equipment.setFactoryModelId(area.getId());
}else if(ObjectUtils.isNotNull(area1)) {
@@ -703,7 +703,7 @@
exceptionNum++;
continue;
}
- SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()));
+ SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0));
if(ObjectUtils.isNotNull(manage)){
equipment.setManageId(manage.getId());
}else{
@@ -711,7 +711,9 @@
exceptionNum++;
continue;
}
- EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentCategoryName.trim()),false);
+ EquipmentCategory equipmentCategory = equipmentCategoryService
+ .getOne(new QueryWrapper<EquipmentCategory>()
+ .eq("name",equipmentCategoryName.trim()).eq("del_flag",0),false);
if(ObjectUtils.isNotNull(equipmentCategory)){
equipment.setEquipmentCategoryId(equipmentCategory.getId());
}
@@ -720,8 +722,8 @@
exceptionNum++;
continue;
}
- Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()),false);
- Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()),false);
+ Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()).eq("del_flag",0),false);
+ Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()).eq("del_flag",0),false);
if(ObjectUtils.isNotNull(team)){
equipment.setTeamId(team.getId());
}else if(ObjectUtils.isNotNull(team1)) {
@@ -756,7 +758,7 @@
}else{
Equipment oriEquipment = equipmentService
.getOne(new QueryWrapper<Equipment>()
- .eq("num",equipmentImportVo.getNum()),false);
+ .eq("num",equipmentImportVo.getNum()).eq("del_flag",0),false);
if(ObjectUtils.isNull(oriEquipment)){
equipment.setNum(equipmentImportVo.getNum())
.setName(equipmentImportVo.getName())
@@ -857,10 +859,12 @@
@PostMapping("addLine")
@Transactional(rollbackFor = {Exception.class})
public Result<?> addLine(@RequestBody Equipment equipment){
+ equipment.setIsLineEquip("no");
equipmentService.save(equipment);
List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
for(Equipment equipment1:equipmentList){
equipment1.setId(equipment1.getShowId());
+ equipment1.setIsLineEquip("yes");
equipment1.setLineId(equipment.getId());
}
equipmentService.updateBatchById(equipmentList);
@@ -874,6 +878,11 @@
List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
for(Equipment equipment1:equipmentList){
equipment1.setLineId(equipment.getId());
+ String id = equipment1.getId();
+ if(StringUtils.isBlank(id)){
+ equipment1.setId(equipment1.getShowId());
+ }
+ equipment1.setIsLineEquip("yes");
}
equipmentService.updateBatchById(equipmentList);
return Result.OK("缂栬緫鎴愬姛");
--
Gitblit v1.9.3