提交

“linengliang”

2023-12-28 b17ab31f94fb11f7098e4c91f9b4386b2020f676

 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("修改成功");
    }

}