Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r14529 -r14532 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 14529) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 14532) @@ -1369,7 +1369,7 @@ int materialDefinitionNameIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "材料名称"); int materialSpecificationIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "材料规格"); int materialDefinitionAmountIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "材料数量"); - int useBasketCountIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "使用篮筐数量"); +// int useBasketCountIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "使用篮筐数量"); int basketSerialNumberIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "篮筐序列号"); int isPackingIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "是否装配"); int isPrintTousseIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "是否打印标签"); @@ -1770,17 +1770,17 @@ proxyDisinfectionPrice, borrowPrice, assetsBelong, sterilingMethod, cleanMethod,isCustomPack,isQuickRecycle); - // 材料使用篮筐数量materialUsebasketAmount - int materialUsebasketAmount = 0; - String materialUsebasketAmountStr = ParerUtils.getCellFormatValue(row, useBasketCountIndex); - if(StringUtils.isNotBlank(materialUsebasketAmountStr)){ - materialUsebasketAmount = NumberUtils.toInt(materialUsebasketAmountStr, -1); - } - if(materialUsebasketAmount < 0){ - failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,useBasketCountIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); - continue; - } +// // 材料使用篮筐数量materialUsebasketAmount +// int materialUsebasketAmount = 0; +// String materialUsebasketAmountStr = ParerUtils.getCellFormatValue(row, useBasketCountIndex); +// if(StringUtils.isNotBlank(materialUsebasketAmountStr)){ +// materialUsebasketAmount = NumberUtils.toInt(materialUsebasketAmountStr, -1); +// } +// if(materialUsebasketAmount < 0){ +// failureCount = appendFailureRowNumAndRecordFailureNum( +// failureCount, sb, currentRowNum,useBasketCountIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); +// continue; +// } // 是否装配 String isPacking = ParerUtils.getCellFormatValue(row, isPackingIndex); if(!yesNoSet.contains(isPacking)){