Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r28583 -r28593 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 28583) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 28593) @@ -3059,6 +3059,11 @@ tousseDefinition.setExplain(explain); // 材料数量 String materialDefinitionNumStr = ParerUtils.getCellFormatValue(row, materialDefinitionAmountIndex); + if (StringUtils.isBlank(materialDefinitionNumStr)) { + failureCount = appendFailureRowNumAndRecordFailureNum( + failureCount, sb, currentRowNum,materialDefinitionAmountIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_BLANK); + continue; + } // 是否植入物 String includePlant = ParerUtils.getCellFormatValue(row, includeImplantIndex); // 可拆卸数量 @@ -3093,6 +3098,11 @@ // 材料数量 String materialDefinitionNumStr = ParerUtils.getCellFormatValue(row, materialDefinitionAmountIndex); + if (StringUtils.isBlank(materialDefinitionNumStr)) { + failureCount = appendFailureRowNumAndRecordFailureNum( + failureCount, sb, currentRowNum,materialDefinitionAmountIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_BLANK); + continue; + } // 是否植入物 String includePlant = ParerUtils.getCellFormatValue(row, includeImplantIndex); // 可拆卸数量 @@ -3572,6 +3582,12 @@ // 材料数量 String materialDefinitionNumStr = ParerUtils.getCellFormatValue(row, materialDefinitionAmountIndex); + if (StringUtils.isBlank(materialDefinitionNumStr)) { + failureCount = appendFailureRowNumAndRecordFailureNum( + failureCount, sb, currentRowNum,materialDefinitionAmountIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_BLANK); + continue; + } + // 篮筐序列号 String basketSerialNumberStr = ParerUtils.getCellFormatValue(row, basketSerialNumberIndex); int basketSerialNumber = 0; @@ -3822,6 +3838,11 @@ // 材料数量 String materialDefinitionNumStr = ParerUtils.getCellFormatValue(row, materialDefinitionAmountIndex); + if (StringUtils.isBlank(materialDefinitionNumStr)) { + failureCount = appendFailureRowNumAndRecordFailureNum( + failureCount, sb, currentRowNum,materialDefinitionAmountIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_BLANK); + continue; + } // 篮筐序列号 String basketSerialNumberStr = ParerUtils.getCellFormatValue(row, basketSerialNumberIndex);