设备台账字段增加查询条件增加

“linengliang”

2023-09-06 8b825a12d64065dd9d8054e5247e374f6cec5390

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

@@ -573,6 +573,30 @@
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备状态缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备技术缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                else if(StringUtils.isBlank(equipmentImportVo.getFactoryModelId())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:车间缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                else if(StringUtils.isBlank(equipmentImportVo.getWorkCenterId())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:产线缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyStart())){
                   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)+"行导入失败,原因:关键设备标识缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                     //非必填项
//                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
//                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:功能位置缺失,请填写必填项后再导入;";
@@ -637,6 +661,7 @@
                            .setEquipmentUda1(equipmentImportVo.getEquipmentUda1())
                            .setManageId(equipmentImportVo.getManageId())
                            .setTeamId(equipmentImportVo.getTeamId())
                            .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
                            .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
                            .setEquipmentCategoryId(equipmentCategory.getId())
                            .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
@@ -662,6 +687,10 @@
                            .setSourceCountry(equipmentImportVo.getSourceCountry())
                            .setModel(equipmentImportVo.getModel())
                            .setSpecification(equipmentImportVo.getSpecification())
                            .setFactoryModelId(equipmentImportVo.getFactoryModelId())
                            .setWorkCenterId(equipmentImportVo.getWorkCenterId())
                            .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                            .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
                            .setGpo(equipmentImportVo.getGpo());
                      equipmentService.save(equipment);
                   }else {