From b17ab31f94fb11f7098e4c91f9b4386b2020f676 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 28 十二月 2023 11:16:02 +0800
Subject: [PATCH] 提交
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 9b570d0..e9fd024 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
@@ -788,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")){
@@ -860,6 +862,7 @@
@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){
@@ -874,7 +877,11 @@
@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());
@@ -887,6 +894,15 @@
equipmentService.updateBatchById(equipmentList);
return Result.OK("缂栬緫鎴愬姛");
}
-
+ @PostMapping("/updateKeyEquipment")
+ public Result<?>updateKeyEquipment(@RequestBody Equipment equipment){
+ equipmentService.update(new UpdateWrapper<Equipment>().eq("specific_equipment","0").set("specific_equipment",null));
+ List<Equipment> keyEquipmentUpdateList = equipment.getKeyEquipmentUpdateList();
+ for(Equipment updateEquipment:keyEquipmentUpdateList){
+ updateEquipment.setId(updateEquipment.getEquipmentId());
+ equipmentService.updateById(updateEquipment);
+ }
+ return Result.OK("淇敼鎴愬姛");
+ }
}
--
Gitblit v1.9.3