修改

“linengliang”

2023-12-13 5c3742eca3b35c96f66c53b8dfabcb6848e03a7d

 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")){
@@ -857,10 +861,13 @@
    @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("编辑成功");