Merge remote-tracking branch 'origin/master'

Lius

2025-04-22 561313b5a3b1b6b3c0214eb5d16795ce36ab07de

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

@@ -187,6 +187,8 @@
            params.setTitleRows(0);
            params.setHeadRows(1);
            params.setNeedSave(true);
            params.setStartSheetIndex(0);
            params.setSheetNum(1);
            try {
                List<EamEquipment> list = ExcelImportUtil.importExcel(file.getInputStream(), EamEquipment.class, params);
                //update-begin-author:taoyan date:20190528 for:批量插入数据
@@ -207,10 +209,10 @@
                        sb.append(String.format("设备编码[%s]使用车间或设备管理员为空，无法导入\n\n", eamEquipment.getEquipmentCode()));
                        continue;
                    }
                    if (eamEquipment.getAcceptanceCheckDate() == null) {
                        sb.append(String.format("设备编码[%s]验收为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
                        continue;
                    }
//                    if (eamEquipment.getAcceptanceCheckDate() == null) {
//                        sb.append(String.format("设备编码[%s]验收为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
//                        continue;
//                    }
                    if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
                        sb.append(String.format("设备编码[%s]技术状态为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
                        continue;