From 5c3742eca3b35c96f66c53b8dfabcb6848e03a7d Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 16:46:19 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 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 91d488b..5f74945 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())
@@ -786,6 +788,8 @@
.setPropertyStatus(equipmentImportVo.getPropertyStatus())
.setWarrantyStart(equipmentImportVo.getWarrantyStart())
.setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+ .setIsLineEquip("no")
+ .setIsLine("no")
.setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
.setGpo(equipmentImportVo.getGpo());
if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
@@ -851,16 +855,19 @@
HttpServletRequest req) {
QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
- IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
+ IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId(),standardDetail.getType());
return Result.OK(pageList);
}
@PostMapping("addLine")
@Transactional(rollbackFor = {Exception.class})
public Result<?> addLine(@RequestBody Equipment equipment){
+ equipment.setIsLineEquip("no");
+ equipment.setIsLine("yes");
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);
@@ -870,10 +877,19 @@
@Transactional(rollbackFor = {Exception.class})
public Result<?> editLine(@RequestBody Equipment equipment){
equipmentService.updateById(equipment);
- equipmentService.update(new UpdateWrapper<Equipment>().eq("line_id",equipment.getId()).set("line_id",null).set("is_meta",null));
+ equipmentService.update(new UpdateWrapper<Equipment>()
+ .eq("line_id",equipment.getId())
+ .set("line_id",null)
+ .set("is_meta",null)
+ .set("is_line_equip","no"));
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