设备台账 1.ABC标识变更记录功能 2.质保日期变更记录功能 3.质保到期提醒 4.ABC标识与关键设备标识联动 5.设备质保期字段添加

“linengliang”

2023-09-08 04ef88cee361ec8730c400d96250a6c1cd9f9d80

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -589,12 +589,8 @@
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:质保开始日期缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyEnd())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:质保结束日期缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                else if(StringUtils.isBlank(equipmentImportVo.getKeyEquipmentIdentification())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:关键设备标识缺失,请填写必填项后再导入;";
                else if(StringUtils.isBlank(equipmentImportVo.getPropertyStatus())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:资产状态缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                     //非必填项
@@ -652,6 +648,16 @@
                       exceptionNum++;
                     }
                      else{
                         if(equipmentImportVo.getPropertyStatus().equals("warranty")){
                      if(
                            ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
                            ||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
                      ){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:该设备处于质保期，质保信息缺失，请先维护质保开始时间或结束时间;";
                         exceptionNum++;
                      }

                   }else{
                   Equipment oriEquipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentImportVo.getNum()),false);
                   if(ObjectUtils.isNull(oriEquipment)){
                      Equipment equipment = new Equipment();
@@ -689,6 +695,7 @@
                            .setSpecification(equipmentImportVo.getSpecification())
                            .setFactoryModelId(equipmentImportVo.getFactoryModelId())
                            .setWorkCenterId(equipmentImportVo.getWorkCenterId())
                               .setPropertyStatus(equipmentImportVo.getPropertyStatus())
                            .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                            .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
                            .setGpo(equipmentImportVo.getGpo());
@@ -698,6 +705,8 @@
                      exceptionNum++;
                   }
                }

                }
             }
             if(exceptionNum!=0){
                String headInfo = "小导提醒您!设备台账：导入成功"+(list.size()-exceptionNum)+"条,失败"+exceptionNum+"条";